Hashtag timelines with multiple tags (#584)

* feat(api/hashtag): add any, all, and none parameter * feat(timeline/hashtag): load with any, all and none parameter * feat(timeline/hashtag): save any, all and none in timeline definition * feat: set hastag parameter in UI * feat: move strings to string res * feat: show hint for tags * refactor: use method for setting up tags text * improve edit dialog, allow creating hashtag timelines * add chips for hashtags * add option for displaying only local posts in hashtag * improve layout and wording --------- Co-authored-by: sk <sk22@mailbox.org>
2023-06-21 01:38:51 +02:00
parent bb4a52f03a
commit be425282a6
36 changed files with 3215 additions and 100 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetHashtagTimeline.java
@@ -2,6 +2,8 @@ package org.joinmastodon.android.api.requests.timelines;

 import com.google.gson.reflect.TypeToken;

+import android.text.TextUtils;
+
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.Status;
@@ -9,6 +11,23 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;

 public class GetHashtagTimeline extends MastodonAPIRequest<List<Status>>{
+	public GetHashtagTimeline(String hashtag, String maxID, String minID, int limit, List<String> containsAny, List<String> containsAll, List<String> containsNone, boolean localOnly){
+		super(HttpMethod.GET, "/timelines/tag/"+hashtag, new TypeToken<>(){});
+		if (localOnly) addQueryParameter("local", "true");
+		if(maxID!=null)
+			addQueryParameter("max_id", maxID);
+		if(minID!=null)
+			addQueryParameter("min_id", minID);
+		if(limit>0)
+			addQueryParameter("limit", ""+limit);
+		if(containsAny!=null && !containsAny.isEmpty())
+			addQueryParameter("any[]", "[" + TextUtils.join(",", containsAny) + "]");
+		if(containsAll!=null && !containsAll.isEmpty())
+			addQueryParameter("all[]", "[" + TextUtils.join(",", containsAll) + "]");
+		if(containsNone!=null && !containsNone.isEmpty())
+			addQueryParameter("none[]", "[" + TextUtils.join(",", containsNone) + "]");
+	}
+
 	public GetHashtagTimeline(String hashtag, String maxID, String minID, int limit){
 		super(HttpMethod.GET, "/timelines/tag/"+hashtag, new TypeToken<>(){});
 		if(maxID!=null)
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -1,12 +1,14 @@
 package org.joinmastodon.android.fragments;

 import static android.view.Menu.NONE;
-
+import static com.hootsuite.nachos.terminator.ChipTerminatorHandler.BEHAVIOR_CHIPIFY_ALL;
 import static org.joinmastodon.android.ui.utils.UiUtils.makeBackItem;

 import android.annotation.SuppressLint;
+import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -14,39 +16,43 @@ import android.view.MotionEvent;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
+import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;

+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;

+import com.hootsuite.nachos.NachoTextView;
+
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
-import org.joinmastodon.android.api.session.AccountSession;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
-import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.TimelineDefinition;
 import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
-import org.joinmastodon.android.ui.views.TextInputFrameLayout;

 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;

 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -62,6 +68,7 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
    private final Map<MenuItem, TimelineDefinition> timelineByMenuItem = new HashMap<>();
    private final List<ListTimeline> listTimelines = new ArrayList<>();
    private final List<Hashtag> hashtags = new ArrayList<>();
+    private MenuItem addHashtagItem;

    public EditTimelinesFragment() {
        super(10);
@@ -132,21 +139,34 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
        }
        TimelineDefinition tl = timelineByMenuItem.get(item);
        if (tl != null) {
-            data.add(tl.copy());
-            adapter.notifyItemInserted(data.size());
-            saveTimelines();
-            updateOptionsMenu();
-        };
+            addTimeline(tl);
+        } else if (item == addHashtagItem) {
+            makeTimelineEditor(null, (hashtag) -> {
+                if (hashtag != null) addTimeline(hashtag);
+            }, null);
+        }
        return true;
    }

+    private void addTimeline(TimelineDefinition tl) {
+        data.add(tl.copy());
+        adapter.notifyItemInserted(data.size());
+        saveTimelines();
+        updateOptionsMenu();
+    }
+
    private void addTimelineToOptions(TimelineDefinition tl, Menu menu) {
        if (data.contains(tl)) return;
-        MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, tl.getTitle(getContext()));
-        item.setIcon(tl.getIcon().iconRes);
+        MenuItem item = addOptionsItem(menu, tl.getTitle(getContext()), tl.getIcon().iconRes);
        timelineByMenuItem.put(item, tl);
    }

+    private MenuItem addOptionsItem(Menu menu, String name, @DrawableRes int icon) {
+        MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, name);
+        item.setIcon(icon);
+        return item;
+    }
+
    private void updateOptionsMenu() {
        if (getActivity() == null) return;
        optionsMenu.clear();
@@ -169,6 +189,7 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>

        TimelineDefinition.getAllTimelines(accountID).forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
        listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl -> addTimelineToOptions(tl, listsMenu));
+        addHashtagItem = addOptionsItem(hashtagsMenu, getContext().getString(R.string.sk_timelines_add), R.drawable.ic_fluent_add_24_regular);
        hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl -> addTimelineToOptions(tl, hashtagsMenu));

        timelinesMenu.getItem().setVisible(timelinesMenu.size() > 0);
@@ -213,6 +234,133 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
        if (updated) UiUtils.restartApp();
    }

+    private boolean setTagListContent(NachoTextView editText, @Nullable List<String> tags) {
+        if (tags == null || tags.isEmpty()) return false;
+        editText.setText(String.join(",", tags));
+        editText.chipifyAllUnterminatedTokens();
+        return true;
+    }
+
+    private NachoTextView prepareChipTextView(NachoTextView nacho) {
+        nacho.addChipTerminator(',', BEHAVIOR_CHIPIFY_ALL);
+        nacho.addChipTerminator('\n', BEHAVIOR_CHIPIFY_ALL);
+        nacho.addChipTerminator(' ', BEHAVIOR_CHIPIFY_ALL);
+        nacho.addChipTerminator(';', BEHAVIOR_CHIPIFY_ALL);
+        nacho.enableEditChipOnTouch(true, true);
+        nacho.setOnFocusChangeListener((v, hasFocus) -> nacho.chipifyAllUnterminatedTokens());
+        return nacho;
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<TimelineDefinition> onSave, Runnable onRemove) {
+        Context ctx = getContext();
+        View view = getActivity().getLayoutInflater().inflate(R.layout.edit_timeline, list, false);
+
+        Button advancedBtn = view.findViewById(R.id.advanced);
+        EditText editText = view.findViewById(R.id.input);
+        if (item != null) editText.setText(item.getCustomTitle());
+        editText.setHint(item != null ? item.getDefaultTitle(ctx) : ctx.getString(R.string.sk_hashtag));
+
+        LinearLayout tagWrap = view.findViewById(R.id.tag_wrap);
+        boolean advancedOptionsAvailable = item == null || item.getType() == TimelineDefinition.TimelineType.HASHTAG;
+        advancedBtn.setVisibility(advancedOptionsAvailable ? View.VISIBLE : View.GONE);
+        view.findViewById(R.id.divider).setVisibility(advancedOptionsAvailable ? View.VISIBLE : View.GONE);
+        advancedBtn.setOnClickListener(l -> {
+            advancedBtn.setSelected(!advancedBtn.isSelected());
+            advancedBtn.setText(advancedBtn.isSelected() ? R.string.sk_advanced_options_hide : R.string.sk_advanced_options_show);
+            tagWrap.setVisibility(advancedBtn.isSelected() ? View.VISIBLE : View.GONE);
+        });
+
+        Switch localOnlySwitch = view.findViewById(R.id.local_only_switch);
+        view.findViewById(R.id.local_only)
+                .setOnClickListener(l -> localOnlySwitch.setChecked(!localOnlySwitch.isChecked()));
+
+        EditText tagMain = view.findViewById(R.id.tag_main);
+        NachoTextView tagsAny = prepareChipTextView(view.findViewById(R.id.tags_any));
+        NachoTextView tagsAll = prepareChipTextView(view.findViewById(R.id.tags_all));
+        NachoTextView tagsNone = prepareChipTextView(view.findViewById(R.id.tags_none));
+        if (item != null) {
+            tagMain.setText(item.getHashtagName());
+            boolean hasAdvanced = setTagListContent(tagsAny, item.getHashtagAny());
+            hasAdvanced = setTagListContent(tagsAll, item.getHashtagAll()) || hasAdvanced;
+            hasAdvanced = setTagListContent(tagsNone, item.getHashtagNone()) || hasAdvanced;
+            if (item.isHashtagLocalOnly()) {
+                localOnlySwitch.setChecked(true);
+                hasAdvanced = true;
+            }
+            if (hasAdvanced) {
+                advancedBtn.setSelected(true);
+                advancedBtn.setText(R.string.sk_advanced_options_hide);
+                tagWrap.setVisibility(View.VISIBLE);
+            }
+        }
+
+        ImageButton btn = view.findViewById(R.id.button);
+        PopupMenu popup = new PopupMenu(ctx, btn);
+        TimelineDefinition.Icon currentIcon = item != null ? item.getIcon() : TimelineDefinition.Icon.HASHTAG;
+        btn.setImageResource(currentIcon.iconRes);
+        btn.setTag(currentIcon.ordinal());
+        btn.setContentDescription(ctx.getString(currentIcon.nameRes));
+        btn.setOnTouchListener(popup.getDragToOpenListener());
+        btn.setOnClickListener(l -> popup.show());
+
+        Menu menu = popup.getMenu();
+        TimelineDefinition.Icon defaultIcon = item != null ? item.getDefaultIcon() : TimelineDefinition.Icon.HASHTAG;
+        menu.add(0, currentIcon.ordinal(), NONE, currentIcon.nameRes).setIcon(currentIcon.iconRes);
+        if (!currentIcon.equals(defaultIcon)) {
+            menu.add(0, defaultIcon.ordinal(), NONE, defaultIcon.nameRes).setIcon(defaultIcon.iconRes);
+        }
+        for (TimelineDefinition.Icon icon : TimelineDefinition.Icon.values()) {
+            if (icon.hidden || icon.ordinal() == (int) btn.getTag()) continue;
+            menu.add(0, icon.ordinal(), NONE, icon.nameRes).setIcon(icon.iconRes);
+        }
+        UiUtils.enablePopupMenuIcons(ctx, popup);
+
+        popup.setOnMenuItemClickListener(menuItem -> {
+            TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[menuItem.getItemId()];
+            btn.setImageResource(icon.iconRes);
+            btn.setTag(menuItem.getItemId());
+            btn.setContentDescription(ctx.getString(icon.nameRes));
+            return true;
+        });
+
+        AlertDialog.Builder builder = new M3AlertDialogBuilder(ctx)
+                .setTitle(item == null ? R.string.sk_add_timeline : R.string.sk_edit_timeline)
+                .setView(view)
+                .setPositiveButton(R.string.save, (d, which) -> {
+                    tagsAny.chipifyAllUnterminatedTokens();
+                    tagsAll.chipifyAllUnterminatedTokens();
+                    tagsNone.chipifyAllUnterminatedTokens();
+                    String name = editText.getText().toString().trim();
+                    String mainHashtag = tagMain.getText().toString().trim();
+                    if (TextUtils.isEmpty(mainHashtag)) mainHashtag = name;
+                    if (item == null && TextUtils.isEmpty(mainHashtag)) {
+                        Toast.makeText(ctx, R.string.sk_add_timeline_tag_error_empty, Toast.LENGTH_SHORT).show();
+                        onSave.accept(null);
+                        return;
+                    }
+
+                    TimelineDefinition tl = item != null ? item : TimelineDefinition.ofHashtag(name);
+                    TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[(int) btn.getTag()];
+                    tl.setIcon(icon);
+                    tl.setTitle(name);
+                    tl.setTagOptions(
+                            mainHashtag,
+                            tagsAny.getChipValues(),
+                            tagsAll.getChipValues(),
+                            tagsNone.getChipValues(),
+                            localOnlySwitch.isChecked()
+                    );
+                    onSave.accept(tl);
+                })
+                .setNegativeButton(R.string.cancel, (d, which) -> {});
+
+        if (onRemove != null) builder.setNeutralButton(R.string.sk_remove, (d, which) -> onRemove.run());
+
+        builder.show();
+        btn.requestFocus();
+    }
+
    private class TimelinesAdapter extends RecyclerView.Adapter<TimelineViewHolder>{
        @NonNull
        @Override
@@ -256,60 +404,19 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
            });
        }

+        private void onSave(TimelineDefinition tl) {
+            saveTimelines();
+            rebind();
+        }
+
+        private void onRemove() {
+            removeTimeline(getAbsoluteAdapterPosition());
+        }
+
        @SuppressLint("ClickableViewAccessibility")
        @Override
        public void onClick() {
-            Context ctx = getContext();
-            LinearLayout view = (LinearLayout) getActivity().getLayoutInflater()
-                    .inflate(R.layout.edit_timeline, (ViewGroup) itemView, false);
-
-            TextInputFrameLayout inputLayout = view.findViewById(R.id.input);
-            EditText editText = inputLayout.getEditText();
-            editText.setText(item.getCustomTitle());
-            editText.setHint(item.getDefaultTitle(ctx));
-
-            ImageButton btn = view.findViewById(R.id.button);
-            PopupMenu popup = new PopupMenu(ctx, btn);
-            TimelineDefinition.Icon currentIcon = item.getIcon();
-            btn.setImageResource(currentIcon.iconRes);
-            btn.setContentDescription(ctx.getString(currentIcon.nameRes));
-            btn.setOnTouchListener(popup.getDragToOpenListener());
-            btn.setOnClickListener(l -> popup.show());
-
-            Menu menu = popup.getMenu();
-            TimelineDefinition.Icon defaultIcon = item.getDefaultIcon();
-            menu.add(0, currentIcon.ordinal(), NONE, currentIcon.nameRes).setIcon(currentIcon.iconRes);
-            if (!currentIcon.equals(defaultIcon)) {
-                menu.add(0, defaultIcon.ordinal(), NONE, defaultIcon.nameRes).setIcon(defaultIcon.iconRes);
-            }
-            for (TimelineDefinition.Icon icon : TimelineDefinition.Icon.values()) {
-                if (icon.hidden || icon.equals(item.getIcon())) continue;
-                menu.add(0, icon.ordinal(), NONE, icon.nameRes).setIcon(icon.iconRes);
-            }
-            UiUtils.enablePopupMenuIcons(ctx, popup);
-
-            popup.setOnMenuItemClickListener(menuItem -> {
-                TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[menuItem.getItemId()];
-                btn.setImageResource(icon.iconRes);
-                btn.setContentDescription(ctx.getString(icon.nameRes));
-                item.setIcon(icon);
-                return true;
-            });
-
-            new M3AlertDialogBuilder(ctx)
-                    .setTitle(R.string.sk_edit_timeline)
-                    .setView(view)
-                    .setPositiveButton(R.string.save, (d, which) -> {
-                        item.setTitle(editText.getText().toString().trim());
-                        rebind();
-                        saveTimelines();
-                    })
-                    .setNeutralButton(R.string.sk_remove, (d, which) ->
-                            removeTimeline(getAbsoluteAdapterPosition()))
-                    .setNegativeButton(R.string.cancel, (d, which) -> {})
-                    .show();
-
-            btn.requestFocus();
+            makeTimelineEditor(item, this::onSave, this::onRemove);
        }
    }

--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -35,7 +35,11 @@ import me.grishka.appkit.utils.V;

 public class HashtagTimelineFragment extends PinnableStatusListFragment {
 	private String hashtag;
+	private List<String> any;
+	private List<String> all;
+	private List<String> none;
 	private boolean following;
+	private boolean localOnly;
 	private MenuItem followButton;

 	@Override
@@ -48,6 +52,10 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {
 		super.onAttach(activity);
 		updateTitle(getArguments().getString("hashtag"));
 		following=getArguments().getBoolean("following", false);
+		localOnly=getArguments().getBoolean("localOnly", false);
+		any=getArguments().getStringArrayList("any");
+		all=getArguments().getStringArrayList("all");
+		none=getArguments().getStringArrayList("none");
 		setHasOptionsMenu(true);
 	}

@@ -118,7 +126,7 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment {

 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count)
+		currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count, any, all, none, localOnly)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
--- a/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
@@ -3,6 +3,7 @@ package org.joinmastodon.android.model;
 import android.app.Fragment;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.TextUtils;

 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
@@ -19,6 +20,7 @@ import org.joinmastodon.android.fragments.discover.BubbleTimelineFragment;
 import org.joinmastodon.android.fragments.discover.FederatedTimelineFragment;
 import org.joinmastodon.android.fragments.discover.LocalTimelineFragment;

+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -33,6 +35,10 @@ public class TimelineDefinition {
    private boolean listIsExclusive;

    private @Nullable String hashtagName;
+    private @Nullable List<String> hashtagAny;
+    private @Nullable List<String> hashtagAll;
+    private @Nullable List<String> hashtagNone;
+    private boolean hashtagLocalOnly;

    public static TimelineDefinition ofList(String listId, String listTitle, boolean listIsExclusive) {
        TimelineDefinition def = new TimelineDefinition(TimelineType.LIST);
@@ -79,10 +85,50 @@ public class TimelineDefinition {
        return title;
    }

+    @Nullable
+    public String getHashtagName() {
+        return hashtagName;
+    }
+
+    @Nullable
+    public List<String> getHashtagAny() {
+        return hashtagAny;
+    }
+
+    @Nullable
+    public List<String> getHashtagAll() {
+        return hashtagAll;
+    }
+
+    @Nullable
+    public List<String> getHashtagNone() {
+        return hashtagNone;
+    }
+
+    public boolean isHashtagLocalOnly() {
+        return hashtagLocalOnly;
+    }
+
    public void setTitle(String title) {
        this.title = title == null || title.isBlank() ? null : title;
    }

+    private List<String> sanitizeTagList(List<String> tags) {
+        return tags.stream()
+                .map(String::trim)
+                .filter(str -> !TextUtils.isEmpty(str))
+                .collect(Collectors.toList());
+    }
+
+    public void setTagOptions(String main, List<String> any, List<String> all, List<String> none, boolean localOnly) {
+        this.hashtagName = main;
+        this.hashtagAny = sanitizeTagList(any);
+        this.hashtagAll = sanitizeTagList(all);
+        this.hashtagNone = sanitizeTagList(none);
+        this.hashtagLocalOnly = localOnly;
+    }
+
+
    public String getDefaultTitle(Context ctx) {
        return switch (type) {
            case HOME -> ctx.getString(R.string.sk_timeline_home);
@@ -140,16 +186,17 @@ public class TimelineDefinition {
        TimelineDefinition that = (TimelineDefinition) o;
        if (type != that.type) return false;
        if (type == TimelineType.LIST) return Objects.equals(listId, that.listId);
-        if (type == TimelineType.HASHTAG) return Objects.equals(hashtagName.toLowerCase(), that.hashtagName.toLowerCase());
+        if (type == TimelineType.HASHTAG) {
+            if (hashtagName == null && that.hashtagName == null) return true;
+            if (hashtagName == null || that.hashtagName == null) return false;
+            return Objects.equals(hashtagName.toLowerCase(), that.hashtagName.toLowerCase());
+        }
        return true;
    }

    @Override
    public int hashCode() {
-        int result = type.ordinal();
-        result = 31 * result + (listId != null ? listId.hashCode() : 0);
-        result = 31 * result + (hashtagName.toLowerCase() != null ? hashtagName.toLowerCase().hashCode() : 0);
-        return result;
+        return Objects.hash(type, title, listId, hashtagName, hashtagAny, hashtagAll, hashtagNone);
    }

    public TimelineDefinition copy() {
@@ -159,6 +206,9 @@ public class TimelineDefinition {
        def.listTitle = listTitle;
        def.listIsExclusive = listIsExclusive;
        def.hashtagName = hashtagName;
+        def.hashtagAny = hashtagAny;
+        def.hashtagAll = hashtagAll;
+        def.hashtagNone = hashtagNone;
        def.icon = icon == null ? null : Icon.values()[icon.ordinal()];
        return def;
    }
@@ -170,6 +220,10 @@ public class TimelineDefinition {
            args.putBoolean("listIsExclusive", listIsExclusive);
        } else if (type == TimelineType.HASHTAG) {
            args.putString("hashtag", hashtagName);
+            args.putBoolean("localOnly", hashtagLocalOnly);
+            args.putStringArrayList("any", hashtagAny == null ? new ArrayList<>() : new ArrayList<>(hashtagAny));
+            args.putStringArrayList("all", hashtagAll == null ? new ArrayList<>() : new ArrayList<>(hashtagAll));
+            args.putStringArrayList("none", hashtagNone == null ? new ArrayList<>() : new ArrayList<>(hashtagNone));
        }
        return args;
    }
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/TagEditText.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/TagEditText.java
@@ -0,0 +1,2 @@
+package org.joinmastodon.android.ui.text;public class TagEditText {
+}