about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/settings.js
diff options
context:
space:
mode:
authorふぁぼ原 <ko_kurihara@yahoo.co.jp>2017-06-06 23:56:10 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-06-06 16:56:10 +0200
commit7623766241862d2ede47558639c357d57b769e3b (patch)
tree3211cfa0d57173b8ced269871a32bf07c4ce36f0 /app/javascript/mastodon/reducers/settings.js
parente34c5a350321c6c1997bdcc15fbd85cfb521f51b (diff)
Add regex filters on the community timeline and the public timeline. (#3564)
* Add regex filter on the community timeline and the public timeline

* correcting

* Adjust the height of header buttons

* Remove trailing spaces

* Remove trailing spaces

* Solve some code duplication

* reset the state of the locale files in app/javascript/mastodon/locales

* adjust to upstream

* adjust to upstream

* change keys of locale settings
Diffstat (limited to 'app/javascript/mastodon/reducers/settings.js')
-rw-r--r--app/javascript/mastodon/reducers/settings.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index ad70806b1..3dc885fab 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -46,6 +46,18 @@ const initialState = Immutable.Map({
       mention: true,
     }),
   }),
+
+  community: Immutable.Map({
+    regex: Immutable.Map({
+      body: '',
+    }),
+  }),
+
+  public: Immutable.Map({
+    regex: Immutable.Map({
+      body: '',
+    }),
+  }),
 });
 
 const moveColumn = (state, uuid, direction) => {