From: Gomasy Date: Sat, 11 Jan 2020 05:41:37 +0000 (+0900) Subject: Keep statuses bookmarked by local users in tootctl statuses remove (#12818) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3b08535463029f45e3524ce2ccaea746eda15c57;p=mastodon.git Keep statuses bookmarked by local users in tootctl statuses remove (#12818) --- diff --git a/lib/mastodon/statuses_cli.rb b/lib/mastodon/statuses_cli.rb index 74f15de5f..ecaac17e3 100644 --- a/lib/mastodon/statuses_cli.rb +++ b/lib/mastodon/statuses_cli.rb @@ -48,6 +48,8 @@ module Mastodon scope = scope.where('id NOT IN (SELECT statuses1.reblog_of_id FROM statuses AS statuses1 WHERE statuses.id = statuses1.reblog_of_id AND (statuses1.uri IS NULL OR statuses1.local OR statuses1.id >= ?))', max_id) # Skip statuses favourited by local users scope = scope.where('id NOT IN (SELECT favourites.status_id FROM favourites WHERE statuses.id = favourites.status_id AND favourites.account_id IN (SELECT accounts.id FROM accounts WHERE domain IS NULL))') + # Skip statuses bookmarked by local users + scope = scope.where('id NOT IN (SELECT bookmarks.status_id FROM bookmarks WHERE statuses.id = bookmarks.status_id AND bookmarks.account_id IN (SELECT accounts.id FROM accounts WHERE domain IS NULL))') unless options[:clean_followed] # Skip accounts followed by local accounts