Iceshrimp improvements

mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIRequest.java

@@ -37,6 +37,8 @@
 public abstract class MastodonAPIRequest<T> extends APIRequest<T>{
 	private static final String TAG="MastodonAPIRequest";
 
+	private static MastodonAPIController unauthenticatedApiController=new MastodonAPIController(null);
+
 	private String domain;
 	private AccountSession account;
 	private String path;
@@ -95,14 +97,14 @@ public MastodonAPIRequest<T> exec(String accountID){
 
 	public MastodonAPIRequest<T> execNoAuth(String domain){
 		this.domain=domain;
-		AccountSessionManager.getInstance().getUnauthenticatedApiController().submitRequest(this);
+		unauthenticatedApiController.submitRequest(this);
 		return this;
 	}
 
 	public MastodonAPIRequest<T> exec(String domain, Token token){
 		this.domain=domain;
 		this.token=token;
-		AccountSessionManager.getInstance().getUnauthenticatedApiController().submitRequest(this);
+		unauthenticatedApiController.submitRequest(this);
 		return this;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/api/StatusInteractionController.java

@@ -7,14 +7,23 @@
 import org.joinmastodon.android.api.requests.statuses.SetStatusBookmarked;
 import org.joinmastodon.android.api.requests.statuses.SetStatusFavorited;
 import org.joinmastodon.android.api.requests.statuses.SetStatusReblogged;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.EmojiReactionsUpdatedEvent;
 import org.joinmastodon.android.events.ReblogDeletedEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
-import org.joinmastodon.android.events.StatusDeletedEvent;
+import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.EmojiCategory;
+import org.joinmastodon.android.model.EmojiReaction;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.model.StatusPrivacy;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import me.grishka.appkit.api.Callback;
@@ -40,6 +49,9 @@ public void setFavorited(Status status, boolean favorited, Consumer<Status> cb){
 		if(!Looper.getMainLooper().isCurrentThread())
 			throw new IllegalStateException("Can only be called from main thread");
 
+		AccountSession session=AccountSessionManager.get(accountID);
+		Instance instance=session.getInstance().get();
+
 		SetStatusFavorited current=runningFavoriteRequests.remove(status.id);
 		if(current!=null){
 			current.cancel();
@@ -52,6 +64,7 @@ public void onSuccess(Status result){
 						result.favouritesCount = Math.max(0, status.favouritesCount + (favorited ? 1 : -1));
 						cb.accept(result);
 						if(updateCounters) E.post(new StatusCountersUpdatedEvent(result));
+						if(instance.isIceshrimpJs()) E.post(new EmojiReactionsUpdatedEvent(status.id, result.reactions, false, null));
 					}
 
 					@Override
@@ -61,12 +74,58 @@ public void onError(ErrorResponse error){
 						status.favourited=!favorited;
 						cb.accept(status);
 						if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+						if(instance.isIceshrimpJs()) E.post(new EmojiReactionsUpdatedEvent(status.id, status.reactions, false, null));
 					}
 				})
 				.exec(accountID);
 		runningFavoriteRequests.put(status.id, req);
 		status.favourited=favorited;
 		if(updateCounters) E.post(new StatusCountersUpdatedEvent(status));
+
+		if(instance.configuration==null || instance.configuration.reactions==null)
+			return;
+
+		String defaultReactionEmojiRaw=instance.configuration.reactions.defaultReaction;
+		if(!instance.isIceshrimpJs() || defaultReactionEmojiRaw==null)
+			return;
+
+		boolean reactionIsCustom=defaultReactionEmojiRaw.startsWith(":");
+		String defaultReactionEmoji=reactionIsCustom ? defaultReactionEmojiRaw.substring(1, defaultReactionEmojiRaw.length()-1) : defaultReactionEmojiRaw;
+		ArrayList<EmojiReaction> reactions=new ArrayList<>(status.reactions.size());
+		for(EmojiReaction reaction:status.reactions){
+			reactions.add(reaction.copy());
+		}
+		Optional<EmojiReaction> existingReaction=reactions.stream().filter(r->r.me).findFirst();
+		Optional<EmojiReaction> existingDefaultReaction=reactions.stream().filter(r->r.name.equals(defaultReactionEmoji)).findFirst();
+		if(existingReaction.isPresent() && !favorited){
+			existingReaction.get().me=false;
+			existingReaction.get().count--;
+			existingReaction.get().pendingChange=true;
+		}else if(existingDefaultReaction.isPresent() && favorited){
+			existingDefaultReaction.get().count++;
+			existingDefaultReaction.get().me=true;
+			existingDefaultReaction.get().pendingChange=true;
+		}else if(favorited){
+			EmojiReaction reaction=null;
+			if(reactionIsCustom){
+				List<EmojiCategory> customEmojis=AccountSessionManager.getInstance().getCustomEmojis(session.domain);
+				for(EmojiCategory category:customEmojis){
+					for(Emoji emoji:category.emojis){
+						if(emoji.shortcode.equals(defaultReactionEmoji)){
+							reaction=EmojiReaction.of(emoji, session.self);
+							break;
+						}
+					}
+				}
+				if(reaction==null)
+					reaction=EmojiReaction.of(defaultReactionEmoji, session.self);
+			}else{
+				reaction=EmojiReaction.of(defaultReactionEmoji, session.self);
+			}
+			reaction.pendingChange=true;
+			reactions.add(reaction);
+		}
+		E.post(new EmojiReactionsUpdatedEvent(status.id, reactions, false, null));
 	}
 
 	public void setReblogged(Status status, boolean reblogged, StatusPrivacy visibility, Consumer<Status> cb){

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java

@@ -14,10 +14,12 @@
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.model.ContentType;
 import org.joinmastodon.android.model.Emoji;
+import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.TimelineDefinition;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Optional;
 
 public class AccountLocalPreferences{
 	private final SharedPreferences prefs;
@@ -59,19 +61,20 @@ public AccountLocalPreferences(SharedPreferences prefs, AccountSession session){
 		serverSideFiltersSupported=prefs.getBoolean("serverSideFilters", false);
 
 		// MEGALODON
+		Optional<Instance> instance=session.getInstance();
 		showReplies=prefs.getBoolean("showReplies", true);
 		showBoosts=prefs.getBoolean("showBoosts", true);
 		recentLanguages=fromJson(prefs.getString("recentLanguages", null), recentLanguagesType, new ArrayList<>());
 		bottomEncoding=prefs.getBoolean("bottomEncoding", false);
-		defaultContentType=enumValue(ContentType.class, prefs.getString("defaultContentType", ContentType.PLAIN.name()));
-		contentTypesEnabled=prefs.getBoolean("contentTypesEnabled", true);
+		defaultContentType=enumValue(ContentType.class, prefs.getString("defaultContentType", instance.map(Instance::isIceshrimp).orElse(false) ? ContentType.MISSKEY_MARKDOWN.name() : ContentType.PLAIN.name()));
+		contentTypesEnabled=prefs.getBoolean("contentTypesEnabled", instance.map(i->!i.isIceshrimp()).orElse(false));
 		timelines=fromJson(prefs.getString("timelines", null), timelinesType, TimelineDefinition.getDefaultTimelines(session.getID()));
 		localOnlySupported=prefs.getBoolean("localOnlySupported", false);
 		glitchInstance=prefs.getBoolean("glitchInstance", false);
 		publishButtonText=prefs.getString("publishButtonText", null);
 		timelineReplyVisibility=prefs.getString("timelineReplyVisibility", null);
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
-		emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", session.getInstance().isPresent() && session.getInstance().get().isAkkoma());
+		emojiReactionsEnabled=prefs.getBoolean("emojiReactionsEnabled", instance.map(i->i.isAkkoma() || i.isIceshrimp()).orElse(false));
 		showEmojiReactions=ShowEmojiReactions.valueOf(prefs.getString("showEmojiReactions", ShowEmojiReactions.HIDE_EMPTY.name()));
 		color=prefs.contains("color") ? ColorPreference.valueOf(prefs.getString("color", null)) : null;
 		recentCustomEmoji=fromJson(prefs.getString("recentCustomEmoji", null), recentCustomEmojiType, new ArrayList<>());

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -72,7 +72,6 @@ public class AccountSessionManager{
 	private HashMap<String, List<EmojiCategory>> customEmojis=new HashMap<>();
 	private HashMap<String, Long> instancesLastUpdated=new HashMap<>();
 	private HashMap<String, Instance> instances=new HashMap<>();
-	private MastodonAPIController unauthenticatedApiController=new MastodonAPIController(null);
 	private Instance authenticatingInstance;
 	private Application authenticatingApp;
 	private String lastActiveAccountID;
@@ -99,7 +98,7 @@ private AccountSessionManager(){
 			Log.e(TAG, "Error loading accounts", x);
 		}
 		lastActiveAccountID=prefs.getString("lastActiveAccount", null);
-		MastodonAPIController.runInBackground(()->readInstanceInfo(domains));
+		readInstanceInfo(domains);
 		maybeUpdateShortcuts();
 	}
 
@@ -232,11 +231,6 @@ public void removeAccount(String id){
 		maybeUpdateShortcuts();
 	}
 
-	@NonNull
-	public MastodonAPIController getUnauthenticatedApiController(){
-		return unauthenticatedApiController;
-	}
-
 	public void authenticate(Activity activity, Instance instance){
 		authenticatingInstance=instance;
 		new CreateOAuthApp()

mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java

@@ -68,14 +68,14 @@ protected List<StatusDisplayItem> buildDisplayItems(Announcement a) {
 		instanceUser.url = "https://"+session.domain+"/about";
 		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
 		instanceUser.emojis = List.of();
-		Status fakeStatus = a.toStatus();
+		Status fakeStatus = a.toStatus(isInstanceIceshrimp());
 		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
 		textItem.textSelectable = true;
 
 		List<StatusDisplayItem> items=new ArrayList<>();
 		items.add(HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead));
 		items.add(textItem);
-		if(!isInstanceAkkoma()) items.add(new EmojiReactionsStatusDisplayItem(a.id, this, fakeStatus, accountID, false, true));
+		if(!isInstanceAkkoma() && !isInstanceIceshrimp()) items.add(new EmojiReactionsStatusDisplayItem(a.id, this, fakeStatus, accountID, false, true));
 		return items;
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -659,6 +659,14 @@ public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warning){
 		warning.getItem().status.filterRevealed = true;
 	}
 
+	public void onFavoriteChanged(Status status, String itemID) {
+		FooterStatusDisplayItem.Holder footer=findHolderOfType(itemID, FooterStatusDisplayItem.Holder.class);
+		if(footer!=null){
+			footer.getItem().status=status;
+			footer.onFavoriteClick();
+		}
+	}
+
 	@Override
 	public String getAccountID(){
 		return accountID;

mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java

@@ -461,7 +461,8 @@ public void onIconChanged(int icon){
 		}
 
 		int typeIndex=contentType.ordinal();
-		contentTypePopup.getMenu().findItem(typeIndex).setChecked(true);
+		if(contentTypePopup.getMenu().findItem(typeIndex)!=null)
+			contentTypePopup.getMenu().findItem(typeIndex).setChecked(true);
 		contentTypeBtn.setSelected(typeIndex != ContentType.UNSPECIFIED.ordinal() && typeIndex != ContentType.PLAIN.ordinal());
 
 		autocompleteViewController=new ComposeAutocompleteViewController(getActivity(), accountID);
@@ -829,14 +830,18 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 
 		publishButton=wrap.findViewById(R.id.publish_btn);
 		languageButton=wrap.findViewById(R.id.language_btn);
-		languageButton.setOnClickListener(v->showLanguageAlert());
-		languageButton.setOnLongClickListener(v->{
-			if(!getLocalPrefs().bottomEncoding){
-				getLocalPrefs().bottomEncoding=true;
-				getLocalPrefs().save();
-			}
-			return false;
-		});
+		if(instance.isIceshrimpJs())
+			languageButton.setVisibility(View.GONE);
+		else {
+			languageButton.setOnClickListener(v->showLanguageAlert());
+			languageButton.setOnLongClickListener(v->{
+				if(!getLocalPrefs().bottomEncoding){
+					getLocalPrefs().bottomEncoding=true;
+					getLocalPrefs().save();
+				}
+				return false;
+			});
+		}
 		publishButton.post(()->publishButton.setMinimumWidth(publishButton.getWidth()));
 
 		publishButton.setOnClickListener(v->{

mastodon/src/main/java/org/joinmastodon/android/fragments/HasAccountID.java

@@ -22,6 +22,14 @@ default boolean isInstancePixelfed() {
         return getInstance().map(Instance::isPixelfed).orElse(false);
     }
 
+	default boolean isInstanceIceshrimp() {
+		return getInstance().map(Instance::isIceshrimp).orElse(false);
+	}
+
+	default boolean isInstanceIceshrimpJs() {
+		return getInstance().map(Instance::isIceshrimpJs).orElse(false);
+	}
+
     default Optional<Instance> getInstance() {
         return getSession().getInstance();
     }

mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java

@@ -19,6 +19,7 @@
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
+import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
@@ -88,7 +89,9 @@ public void onAttach(Activity activity){
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Notification n){
 		NotificationHeaderStatusDisplayItem titleItem;
-		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS){
+		Account self=AccountSessionManager.get(accountID).self;
+		if(n.type==Notification.Type.MENTION || n.type==Notification.Type.STATUS
+				|| (n.type==Notification.Type.REBLOG && !n.status.account.id.equals(self.id))){ // Iceshrimp quote
 			titleItem=null;
 		}else{
 			titleItem=new NotificationHeaderStatusDisplayItem(n.id, this, n, accountID);
@@ -272,13 +275,16 @@ public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
 	public void onEmojiReactionsChanged(EmojiReactionsUpdatedEvent ev){
 		for(Notification n : data){
 			if(n.status!=null && n.status.getContentStatus().id.equals(ev.id)){
-				n.status.getContentStatus().update(ev);
-				AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
 				for(int i=0; i<list.getChildCount(); i++){
 					RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 					if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && reactions.getItem().status==n.status.getContentStatus() && ev.viewHolder!=holder){
-						reactions.rebind();
-					}else if(holder instanceof TextStatusDisplayItem.Holder text && text.getItem().parentID.equals(n.getID())){
+						reactions.updateReactions(ev.reactions);
+					}
+				}
+				AccountSessionManager.get(accountID).getCacheController().updateNotification(n);
+				for(int i=0;i<list.getChildCount();i++){
+					RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+					if(holder instanceof TextStatusDisplayItem.Holder text && text.getItem().parentID.equals(n.getID())){
 						text.rebind();
 					}
 				}

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -1020,7 +1020,7 @@ private void updateRelationship(){
 		else hidePrivateNote();
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
-		notifyButton.setVisibility(relationship.following ? View.VISIBLE : View.GONE);
+		notifyButton.setVisibility(relationship.following && !isInstanceIceshrimpJs() ? View.VISIBLE : View.GONE);
 		UiUtils.setRelationshipToActionButtonM3(relationship, actionButton);
 		actionProgress.setIndeterminateTintList(actionButton.getTextColors());
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -286,13 +286,16 @@ public void onStatusCountersUpdated(StatusCountersUpdatedEvent ev){
 		public void onEmojiReactionsChanged(EmojiReactionsUpdatedEvent ev){
 			for(Status s:data){
 				if(s.getContentStatus().id.equals(ev.id)){
-					s.getContentStatus().update(ev);
-					AccountSessionManager.get(accountID).getCacheController().updateStatus(s);
 					for(int i=0;i<list.getChildCount();i++){
 						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
 						if(holder instanceof EmojiReactionsStatusDisplayItem.Holder reactions && reactions.getItem().status==s.getContentStatus() && ev.viewHolder!=holder){
-							reactions.rebind();
-						}else if(holder instanceof TextStatusDisplayItem.Holder text && text.getItem().parentID.equals(s.getID())){
+							reactions.updateReactions(ev.reactions);
+						}
+					}
+					AccountSessionManager.get(accountID).getCacheController().updateStatus(s);
+					for(int i=0;i<list.getChildCount();i++){
+						RecyclerView.ViewHolder holder=list.getChildViewHolder(list.getChildAt(i));
+						if(holder instanceof TextStatusDisplayItem.Holder text && text.getItem().parentID.equals(s.getID())){
 							text.rebind();
 						}
 					}

mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java

@@ -289,7 +289,7 @@ public static List<NeighborAncestryInfo> mapNeighborhoodAncestry(Status mainStat
 					// descendant neighbor
 					Optional
 							.ofNullable(count > index + 1 ? statuses.get(index + 1) : null)
-							.filter(s -> s.inReplyToId.equals(current.id))
+							.filter(s -> s.inReplyToId!=null && s.inReplyToId.equals(current.id)) // inReplyToId is null for quote posts on Iceshrimp
 							.orElse(null),
 					// ancestoring neighbor
 					Optional.ofNullable(index > 0 ? ancestry.get(index - 1) : null)