Merge pull request #3430 from pixelfed/staging

Staging

CHANGELOG.md

@@ -125,8 +125,12 @@
 - Updated CollectionController, limit unpublished collections to owner. ([a0061eb5](https://github.com/pixelfed/pixelfed/commit/a0061eb5))
 - Updated AP Inbox, fixes #3332. ([f8931dc7](https://github.com/pixelfed/pixelfed/commit/f8931dc7))
 - Updated AdminReportController, add account delete button. ([563817a9](https://github.com/pixelfed/pixelfed/commit/563817a9))
-- Updated ApiV1Controller, added /api/v2/media endpoint, fixes #3405 ([f07cc14c](https://github.com/pixelfed/pixelfed/commit/f07cc14c))
-- Updated AP fanout, added Content-Type and User-Agent for activity delivery ([@noellabo](https://github.com/noellabo)) ([209c125](https://github.com/pixelfed/pixelfed/commit/209c125))
+- Updated ApiV1Controller, added /api/v2/media endpoint, fixes #3405. ([f07cc14c](https://github.com/pixelfed/pixelfed/commit/f07cc14c))
+- Updated AP fanout, added Content-Type and User-Agent for activity delivery. ([@noellabo](https://github.com/noellabo)) ([209c125](https://github.com/pixelfed/pixelfed/commit/209c125))
+- Updated DirectMessageController to support new Metro 2.0 UI DMs. ([a4659fd2](https://github.com/pixelfed/pixelfed/commit/a4659fd2))
+- Updated Like model, bump max likes per day from 100 to 200. ([71ba5fed](https://github.com/pixelfed/pixelfed/commit/71ba5fed))
+- Updated HashtagService, use sorted set for followed tags. ([153eb6ba](https://github.com/pixelfed/pixelfed/commit/153eb6ba))
+- Updated Discover component, fixed post side effects (fixes #3409). ([fe5a92b2](https://github.com/pixelfed/pixelfed/commit/fe5a92b2))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

app/Http/Controllers/Api/ApiV1Controller.php

@@ -1061,7 +1061,7 @@ class ApiV1Controller extends Controller
 		abort_if(
 			Like::whereProfileId($user->profile_id)
 				->where('created_at', '>', now()->subDay())
-				->count() >= 100,
+				->count() >= Like::MAX_PER_DAY,
 			429
 		);
 

app/Http/Controllers/DirectMessageController.php

@@ -19,6 +19,8 @@ use App\Services\MediaBlocklistService;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use Illuminate\Support\Str;
 use App\Util\ActivityPub\Helpers;
+use App\Services\AccountService;
+use App\Services\StatusService;
 use App\Services\WebfingerService;
 use App\Models\Conversation;
 
@@ -435,8 +437,10 @@ class DirectMessageController extends Controller
 			->get();
 		}
 
-
-		$res = $res->map(function($s) use ($uid){
+		$res = $res->filter(function($s) {
+			return $s && $s->status;
+		})
+		->map(function($s) use ($uid) {
 			return [
 				'id' => (string) $s->id,
 				'hidden' => (bool) $s->is_hidden,
@@ -449,7 +453,8 @@ class DirectMessageController extends Controller
 				'reportId' => (string) $s->status_id,
 				'meta' => json_decode($s->meta,true)
 			];
-		});
+		})
+		->values();
 
 		$w = [
 			'id' => (string) $r->id,
@@ -458,10 +463,10 @@ class DirectMessageController extends Controller
 			'avatar' => $r->avatarUrl(),
 			'url' => $r->url(),
 			'muted' => UserFilter::whereUserId($uid)
-			->whereFilterableId($r->id)
-			->whereFilterableType('App\Profile')
-			->whereFilterType('dm.mute')
-			->first() ? true : false,
+				->whereFilterableId($r->id)
+				->whereFilterableType('App\Profile')
+				->whereFilterType('dm.mute')
+				->first() ? true : false,
 			'isLocal' => (bool) !$r->domain,
 			'domain' => $r->domain,
 			'timeAgo' => $r->created_at->diffForHumans(null, true, true),
@@ -482,17 +487,62 @@ class DirectMessageController extends Controller
 		$pid = $request->user()->profile_id;
 
 		$dm = DirectMessage::whereFromId($pid)
-		->whereStatusId($sid)
-		->firstOrFail();
+			->whereStatusId($sid)
+			->firstOrFail();
 
 		$status = Status::whereProfileId($pid)
-		->findOrFail($dm->status_id);
+			->findOrFail($dm->status_id);
 
-		if($dm->recipient->domain) {
+		$recipient = AccountService::get($dm->to_id);
+
+		if(!$recipient) {
+			return response('', 422);
+		}
+
+		if($recipient['local'] == false) {
 			$dmc = $dm;
 			$this->remoteDelete($dmc);
 		}
 
+		if(Conversation::whereStatusId($sid)->count()) {
+			$latest = DirectMessage::where(['from_id' => $dm->from_id, 'to_id' => $dm->to_id])
+				->orWhere(['to_id' => $dm->from_id, 'from_id' => $dm->to_id])
+				->latest()
+				->first();
+
+			if($latest->status_id == $sid) {
+				Conversation::where(['to_id' => $dm->from_id, 'from_id' => $dm->to_id])
+					->update([
+						'updated_at' => $latest->updated_at,
+						'status_id' => $latest->status_id,
+						'type' => $latest->type,
+						'is_hidden' => false
+					]);
+
+				Conversation::where(['to_id' => $dm->to_id, 'from_id' => $dm->from_id])
+					->update([
+						'updated_at' => $latest->updated_at,
+						'status_id' => $latest->status_id,
+						'type' => $latest->type,
+						'is_hidden' => false
+					]);
+			} else {
+				Conversation::where([
+					'status_id' => $sid,
+					'to_id' => $dm->from_id,
+					'from_id' => $dm->to_id
+				])->delete();
+
+				Conversation::where([
+					'status_id' => $sid,
+					'from_id' => $dm->from_id,
+					'to_id' => $dm->to_id
+				])->delete();
+			}
+		}
+
+		StatusService::del($status->id, true);
+
 		$status->delete();
 		$dm->delete();
 

app/Http/Controllers/DiscoverController.php

@@ -16,7 +16,11 @@ use App\{
 };
 use Auth, DB, Cache;
 use Illuminate\Http\Request;
+use App\Services\BookmarkService;
 use App\Services\ConfigCacheService;
+use App\Services\HashtagService;
+use App\Services\LikeService;
+use App\Services\ReblogService;
 use App\Services\StatusHashtagService;
 use App\Services\SnowflakeService;
 use App\Services\StatusService;
@@ -76,10 +80,8 @@ class DiscoverController extends Controller
 		$tag = $request->input('hashtag');
 
 		$hashtag = Hashtag::whereName($tag)->firstOrFail();
-		if($user && $page == 1) {
-			$res['follows'] = HashtagFollow::whereUserId($user->id)
-				->whereHashtagId($hashtag->id)
-				->exists();
+		if($user) {
+			$res['follows'] = HashtagService::isFollowing($user->profile_id, $hashtag->id);
 		}
 		$res['hashtag'] = [
 			'name' => $hashtag->name,
@@ -88,6 +90,12 @@ class DiscoverController extends Controller
 		if($user) {
 			$tags = StatusHashtagService::get($hashtag->id, $page, $end);
 			$res['tags'] = collect($tags)
+				->map(function($tag) use($user) {
+					$tag['status']['favourited'] = (bool) LikeService::liked($user->profile_id, $tag['status']['id']);
+					$tag['status']['reblogged'] = (bool) ReblogService::get($user->profile_id, $tag['status']['id']);
+					$tag['status']['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $tag['status']['id']);
+					return $tag;
+				})
 				->filter(function($tag) {
 					if(!StatusService::get($tag['status']['id'])) {
 						return false;

app/Http/Controllers/HashtagFollowController.php

@@ -9,6 +9,7 @@ use App\{
 	HashtagFollow,
 	Status
 };
+use App\Services\HashtagService;
 
 class HashtagFollowController extends Controller
 {
@@ -37,9 +38,11 @@ class HashtagFollowController extends Controller
 
         if($hashtagFollow->wasRecentlyCreated) {
             $state = 'created';
+            HashtagService::follow($profile->id, $hashtag->id);
             // todo: send to HashtagFollowService
         } else {
             $state = 'deleted';
+            HashtagService::unfollow($profile->id, $hashtag->id);
             $hashtagFollow->delete();
         }
 

app/Http/Controllers/LikeController.php

@@ -33,6 +33,12 @@ class LikeController extends Controller
 			$like = Like::whereProfileId($profile->id)->whereStatusId($status->id)->firstOrFail();
 			UnlikePipeline::dispatch($like);
 		} else {
+			abort_if(
+				Like::whereProfileId($user->profile_id)
+					->where('created_at', '>', now()->subDay())
+					->count() >= Like::MAX_PER_DAY,
+				429
+			);
 			$count = $status->likes_count > 4 ? $status->likes_count : $status->likes()->count();
 			$like = Like::firstOrCreate([
 				'profile_id' => $user->profile_id,

app/Jobs/StoryPipeline/StoryFanout.php

@@ -81,7 +81,6 @@ class StoryFanout implements ShouldQueue
 			foreach($audience as $url) {
 				$version = config('pixelfed.version');
 				$appUrl = config('app.url');
-				$proxy = config('');
 				$headers = HttpSignature::sign($profile, $url, $activity, [
 					'Content-Type'	=> 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
 					'User-Agent'	=> "(Pixelfed/{$version}; +{$appUrl})",

app/Like.php

@@ -9,6 +9,8 @@ class Like extends Model
 {
     use SoftDeletes;
 
+    const MAX_PER_DAY = 200;
+
     /**
      * The attributes that should be mutated to dates.
      *

app/Services/HashtagService.php

@@ -2,12 +2,16 @@
 
 namespace App\Services;
 
-use Cache;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
 use App\Hashtag;
 use App\StatusHashtag;
+use App\HashtagFollow;
 
 class HashtagService {
 
+	const FOLLOW_KEY = 'pf:services:hashtag:following:';
+
 	public static function get($id)
 	{
 		return Cache::remember('services:hashtag:by_id:' . $id, 3600, function() use($id) {
@@ -29,4 +33,35 @@ class HashtagService {
 		});
 	}
 
+	public static function isFollowing($pid, $hid)
+	{
+		$res = Redis::zscore(self::FOLLOW_KEY . $pid, $hid);
+		if($res) {
+			return true;
+		}
+
+		$synced = Cache::get(self::FOLLOW_KEY . $pid . ':synced');
+		if(!$synced) {
+			$tags = HashtagFollow::whereProfileId($pid)
+				->get()
+				->each(function($tag) use($pid) {
+					self::follow($pid, $tag->hashtag_id);
+				});
+			Cache::set(self::FOLLOW_KEY . $pid . ':synced', true, 1209600);
+
+			return (bool) Redis::zscore(self::FOLLOW_KEY . $pid, $hid) > 1;
+		}
+
+		return false;
+	}
+
+	public static function follow($pid, $hid)
+	{
+		return Redis::zadd(self::FOLLOW_KEY . $pid, $hid, $hid);
+	}
+
+	public static function unfollow($pid, $hid)
+	{
+		return Redis::zrem(self::FOLLOW_KEY . $pid, $hid);
+	}
 }

public/js/installer.js.LICENSE.txt

@@ -1 +0,0 @@
-/*! @source http://purl.eligrey.com/github/canvas-toBlob.js/blob/master/canvas-toBlob.js */