Add voter participation sticker for Project Loved

.env.example

@@ -88,6 +88,7 @@ SLACK_ENDPOINT=https://myconan.net/null/
 # INITIAL_HELP_FORUM_IDS="5 47 85"
 # ISSUE_FORUM_IDS=
 # FORUM_POST_MINIMUM_PLAYS=200
+# PROJECT_LOVED_FORUM_ID=120
 
 # GA_TRACKING_ID=UA-xxx
 

app/Http/Controllers/UsersController.php

@@ -498,6 +498,7 @@ public function me($mode = null)
      * - statistics.variants
      * - support_level
      * - user_achievements
+     * - voted_in_project_loved
      *
      * @urlParam user integer required Id or username of the user. Id lookup is prioritised unless `key` parameter is specified. Previous usernames are also checked in some cases. Example: 1
      * @urlParam mode string [GameMode](#gamemode). User default mode will be used if not specified. Example: osu

app/Libraries/ProjectLovedPollsCache.php

@@ -0,0 +1,49 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Libraries;
+
+use App\Models\Forum\Topic;
+use App\Models\User;
+use App\Traits\LocallyCached;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
+
+class ProjectLovedPollsCache
+{
+    use LocallyCached;
+
+    /**
+     * Get all topics on the Project Loved forum that have an open poll and finite poll length.
+     */
+    public function all(): Collection
+    {
+        $topics = $this->cachedMemoize(__FUNCTION__, function () {
+            return Topic
+                ::where('forum_id', config('osu.forum.project_loved_forum_id'))
+                ->whereRaw('poll_start + poll_length > ?', [Carbon::now()->getTimestamp()])
+                ->get();
+        });
+
+        if ($topics->contains(fn (Topic $topic) => !$topic->poll()->isOpen())) {
+            $this->resetCache();
+            return $this->all();
+        }
+
+        return $topics;
+    }
+
+    /**
+     * Check if the user voted in any open Project Loved polls.
+     */
+    public function userVotedAny(User $user): bool
+    {
+        return $this->memoize(__FUNCTION__.':'.$user->getKey(), function () use ($user) {
+            return $this->all()->contains(fn (Topic $topic) => $topic->poll()->votedBy($user));
+        });
+    }
+}

app/Listeners/OctaneResetLocalCache.php

@@ -11,5 +11,6 @@ public function handle($event): void
     {
         app('chat-filters')->incrementResetTicker();
         app('groups')->incrementResetTicker();
+        app('loved-polls')->incrementResetTicker();
     }
 }

app/Models/Forum/TopicPoll.php

@@ -106,7 +106,7 @@ public function save()
             return false;
         }
 
-        return DB::transaction(function () {
+        DB::transaction(function () {
             $this->topic->update([
                 'poll_title' => $this->params['title'],
                 'poll_start' => Carbon::now(),
@@ -133,9 +133,13 @@ public function save()
                     'poll_option_text' => $value,
                 ]);
             }
-
-            return true;
         });
+
+        if ($this->topic->forum_id === config('osu.forum.project_loved_forum_id')) {
+            app('loved-polls')->resetCache();
+        }
+
+        return true;
     }
 
     public function setTopic($topic)

app/Providers/AppServiceProvider.php

@@ -14,6 +14,7 @@
 use App\Libraries\OsuAuthorize;
 use App\Libraries\OsuCookieJar;
 use App\Libraries\OsuMessageSelector;
+use App\Libraries\ProjectLovedPollsCache;
 use App\Libraries\RouteSection;
 use App\Libraries\User\ScorePins;
 use Datadog;
@@ -34,6 +35,7 @@ class AppServiceProvider extends ServiceProvider
         'assets-manifest' => AssetsManifest::class,
         'chat-filters' => ChatFilters::class,
         'groups' => Groups::class,
+        'loved-polls' => ProjectLovedPollsCache::class,
         'route-section' => RouteSection::class,
         'score-pins' => ScorePins::class,
     ];
@@ -55,6 +57,7 @@ public function boot()
             app('OsuAuthorize')->resetCache();
             app('groups')->incrementResetTicker();
             app('chat-filters')->incrementResetTicker();
+            app('loved-polls')->incrementResetTicker();
 
             Datadog::increment(
                 config('datadog-helper.prefix_web').'.queue.run',

app/Transformers/UserCompactTransformer.php

@@ -39,6 +39,7 @@ class UserCompactTransformer extends TransformerAbstract
         'mapping_follower_count',
         'previous_usernames',
         'support_level',
+        'voted_in_project_loved',
     ];
 
     protected string $mode;
@@ -85,6 +86,7 @@ class UserCompactTransformer extends TransformerAbstract
         'unread_pm_count',
         'user_achievements',
         'user_preferences',
+        'voted_in_project_loved',
         // TODO: should be changed to rank_history
         // TODO: should be alphabetically ordered but lazer relies on being after statistics. can revert to alphabetical after 2020-05-01
         'rankHistory',
@@ -427,6 +429,11 @@ public function includeUserPreferences(User $user)
         ]));
     }
 
+    public function includeVotedInProjectLoved(User $user)
+    {
+        return $this->primitive(app('loved-polls')->userVotedAny($user));
+    }
+
     public function setMode(string $mode)
     {
         $this->mode = $mode;

config/osu.php

@@ -107,6 +107,7 @@
         'minimum_plays' => get_int(env('FORUM_POST_MINIMUM_PLAYS')) ?? 200,
         'necropost_months' => 6,
         'poll_edit_hours' => get_int(env('FORUM_POLL_EDIT_HOURS')) ?? 1,
+        'project_loved_forum_id' => get_int(env('PROJECT_LOVED_FORUM_ID')) ?? 120,
 
         'double_post_time' => [
             'author' => 24,

resources/assets/less/bem-index.less

@@ -296,7 +296,8 @@
 @import "bem/profile-previous-usernames";
 @import "bem/profile-rank-count";
 @import "bem/profile-stats";
-@import "bem/profile-tournament-banner";
+@import "bem/profile-header-banner";
+@import "bem/profile-header-banners";
 @import "bem/proportional-container";
 @import "bem/qtip";
 @import "bem/quick-info";

resources/assets/less/bem/profile-header-banner.less

@@ -0,0 +1,47 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.profile-header-banner {
+  @_top: profile-header-banner;
+  overflow: hidden;
+
+  @media @desktop {
+    .own-layer();
+    transition: transform .2s cubic-bezier(.08,.82,.17,1);
+
+    &:hover {
+      transform: scale(1.1);
+      z-index: 1;
+    }
+
+    & + & {
+      margin-left: 10px;
+    }
+  }
+
+  &--loved-voted-sticker {
+    .default-border-radius();
+    .link-plain();
+    .link-white();
+    background-color: @osu-colour-b6;
+    display: flex;
+    flex-direction: row-reverse;
+    align-items: center;
+    padding: 4px 0 4px 10px;
+
+    .@{_top}__image {
+      margin-left: -10px;
+    }
+  }
+
+  &--tournament {
+    @media @desktop {
+      .default-border-radius();
+      width: 60%;
+    }
+
+    .@{_top}__image {
+      width: 100%;
+    }
+  }
+}

resources/assets/less/bem/profile-header-banners.less

@@ -0,0 +1,11 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.profile-header-banners {
+  display: flex;
+  align-items: end;
+
+  @media @desktop {
+    margin-bottom: 10px;
+  }
+}

resources/assets/less/variables.less

@@ -93,7 +93,6 @@
 
 @z-index--beatmaps-panel: 4;
 @z-index--profile-previous-usernames: 10;
-@z-index--profile-tournament-banner: 11;
 @z-index--page-extra-tabs: 99;
 @z-index--profile-page-cover-selector: 100; // must be at least 1 more than @z-index--page-extra-tabs
 @z-index--beatmap-discussion-editor-insertion-menu: 100;

resources/assets/lib/components/profile-header-banners.tsx

@@ -0,0 +1,41 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+import Img2x from 'components/img2x';
+import UserProfileJson from 'interfaces/user-profile-json';
+import { route } from 'laroute';
+import * as React from 'react';
+
+interface Props {
+  user: UserProfileJson;
+}
+
+export default function ProfileHeaderBanners({ user }: Props) {
+  const {
+    active_tournament_banner: tournamentBanner,
+    voted_in_project_loved: votedInProjectLoved,
+  } = user;
+
+  return (
+    <div className='profile-header-banners'>
+      {tournamentBanner != null && (
+        <a
+          className='profile-header-banner profile-header-banner--tournament'
+          href={route('tournaments.show', { tournament: tournamentBanner.tournament_id })}
+        >
+          <Img2x className='profile-header-banner__image' src={tournamentBanner.image} />
+        </a>
+      )}
+      {votedInProjectLoved && (
+        <a
+          className='profile-header-banner profile-header-banner--loved-voted-sticker'
+          href={route('forum.forums.show', { forum: 120 })}
+          title={osu.trans('users.show.loved_voted_sticker.title', { username: user.username })}
+        >
+          <Img2x className='profile-header-banner__image' src='/images/layout/loved-voted-sticker.png' />
+          <span>{osu.trans('users.show.loved_voted_sticker.content')}</span>
+        </a>
+      )}
+    </div>
+  );
+}

resources/assets/lib/interfaces/user-json.ts

@@ -62,6 +62,7 @@ interface UserJsonAvailableIncludes {
   unread_pm_count: number;
   user_achievements: UserAchievementJson[];
   user_preferences: UserPreferencesJson;
+  voted_in_project_loved: boolean;
 }
 
 interface UserJsonDefaultAttributes {

resources/assets/lib/interfaces/user-profile-json.ts

@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+import UserExtendedJson from './user-extended-json';
+import UserJson from './user-json';
+
+type UserProfileHeaderIncludes =
+  | 'active_tournament_banner'
+  | 'badges'
+  | 'comments_count'
+  | 'follower_count'
+  | 'groups'
+  | 'mapping_follower_count'
+  | 'previous_usernames'
+  | 'support_level'
+  | 'voted_in_project_loved';
+
+type UserProfileJson = UserExtendedJson & Required<Pick<UserJson, UserProfileHeaderIncludes>>;
+
+export default UserProfileJson;

resources/assets/lib/modding-profile/header.coffee

@@ -3,7 +3,7 @@
 
 import HeaderV4 from 'components/header-v4'
 import Img2x from 'components/img2x'
-import ProfileTournamentBanner from 'components/profile-tournament-banner'
+import ProfileHeaderBanners from 'components/profile-header-banners'
 import Badges from 'profile-page/badges'
 import Detail from 'profile-page/detail'
 import HeaderInfo from 'profile-page/header-info'
@@ -22,8 +22,7 @@ export class Header extends React.Component
       'data-page-id': 'main'
       el HeaderV4,
         backgroundImage: @props.user.cover.url
-        contentPrepend: el ProfileTournamentBanner,
-          banner: @props.user.active_tournament_banner
+        contentPrepend: el ProfileHeaderBanners, user: @props.user
         links: headerLinks(@props.user, 'modding')
         theme: 'users'
       div className: 'osu-page osu-page--users',