diff --git a/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java index 9e85a76b..e3f56779 100644 --- a/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/TimelineHelper.java @@ -209,7 +209,7 @@ public class TimelineHelper { if (filterKeyword.whole_word) { p = Pattern.compile(sb + "(" + Pattern.quote(filterKeyword.keyword) + ")" + eb, Pattern.CASE_INSENSITIVE); } else { - p = Pattern.compile("#" + Pattern.quote(filterKeyword.keyword), Pattern.CASE_INSENSITIVE); + p = Pattern.compile("(" + Pattern.quote(filterKeyword.keyword) + ")", Pattern.CASE_INSENSITIVE); } for (Notification notification : notifications) { diff --git a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java index 4157f0b7..037da464 100644 --- a/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java +++ b/app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java @@ -53,10 +53,8 @@ import app.fedilab.android.client.entities.api.Statuses; import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.client.entities.api.Token; import app.fedilab.android.client.entities.app.StatusCache; -import app.fedilab.android.client.entities.app.Timeline; import app.fedilab.android.helper.Helper; import app.fedilab.android.helper.MastodonHelper; -import app.fedilab.android.helper.TimelineHelper; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; import retrofit2.Call; @@ -910,8 +908,7 @@ public class AccountsVM extends AndroidViewModel { Response> bookmarksResponse = bookmarksCall.execute(); if (bookmarksResponse.isSuccessful()) { statusList = bookmarksResponse.body(); - // TimelineHelper.filterStatus(getApplication().getApplicationContext(), statusList, Timeline.TimeLineEnum.PUBLIC); - statuses.statuses = TimelineHelper.filterStatus(getApplication().getApplicationContext(), statusList, Timeline.TimeLineEnum.PUBLIC); + statuses.statuses = statusList; statuses.pagination = MastodonHelper.getPagination(bookmarksResponse.headers()); } } catch (Exception e) {