Release 2024-02-22 02:12:52

.rubocop.yml

@@ -2,8 +2,6 @@ require:
   - rubocop-minitest
   - rubocop-capybara
 
-inherit_from: .rubocop_todo.yml
-
 inherit_gem:
   rubocop-fjord:
     - config/rubocop.yml

app/controllers/admin/campaigns_controller.rb

@@ -6,7 +6,7 @@ class Admin::CampaignsController < AdminController
   def new
     start_at = Time.current.beginning_of_day
     @campaign = Campaign.new(
-      start_at: start_at,
+      start_at:,
       end_at: start_at + 7.days - 1.minute,
       trial_period: 7
     )

app/controllers/announcements_controller.rb

@@ -15,20 +15,20 @@ def new
       copy_announcement(params[:id])
     elsif params[:page_id]
       page = Page.find(params[:page_id])
-      copy_template_by_resource('page_announcements.yml', page: page)
+      copy_template_by_resource('page_announcements.yml', page:)
     elsif params[:event_id]
       event = Event.find(params[:event_id])
-      copy_template_by_resource('event_announcements.yml', event: event)
+      copy_template_by_resource('event_announcements.yml', event:)
     elsif params[:regular_event_id]
       regular_event = RegularEvent.find(params[:regular_event_id])
       organizers = regular_event.organizers.map { |organizer| "@#{organizer.login_name}" }.join("\n    - ")
       holding_cycles = ActiveDecorator::Decorator.instance.decorate(regular_event).holding_cycles
       hold_national_holiday = "(祝日#{regular_event.hold_national_holiday ? 'も開催' : 'は休み'})"
       copy_template_by_resource('regular_event_announcements.yml',
-                                regular_event: regular_event,
-                                organizers: organizers,
-                                holding_cycles: holding_cycles,
-                                hold_national_holiday: hold_national_holiday)
+                                regular_event:,
+                                organizers:,
+                                holding_cycles:,
+                                hold_national_holiday:)
     end
   end
 
@@ -115,7 +115,7 @@ def copy_announcement(announcement_id)
   end
 
   def copy_template_by_resource(template_file, params = {})
-    template = MessageTemplate.load(template_file, params: params)
+    template = MessageTemplate.load(template_file, params:)
     @announcement.title       = template['title']
     @announcement.description = template['description']
   end

app/controllers/api/admin/count_controller.rb

@@ -11,6 +11,6 @@ def show
       hibernated_at: nil
     ).count
 
-    render json: { users_count: users_count }
+    render json: { users_count: }
   end
 end

app/controllers/api/bookmarks_controller.rb

@@ -11,7 +11,7 @@ def index
 
     @bookmarks = Bookmark.where(
       user: current_user,
-      bookmarkable: bookmarkable
+      bookmarkable:
     )
   end
 
@@ -21,7 +21,7 @@ def create
     else
       @bookmark = Bookmark.create!(
         user: current_user,
-        bookmarkable: bookmarkable
+        bookmarkable:
       )
       render status: :created, json: @bookmark
     end

app/controllers/api/checks_controller.rb

@@ -5,15 +5,15 @@ class API::ChecksController < API::BaseController
 
   def index
     @checks = Check.where(
-      checkable: checkable
+      checkable:
     )
   end
 
   def create
     if checkable.checks.empty?
       @check = Check.create!(
         user: current_user,
-        checkable: checkable
+        checkable:
       )
       Newspaper.publish(:check_create, { check: @check })
       head :created
@@ -24,6 +24,8 @@ def create
 
   def destroy
     @check = Check.find(params[:id]).destroy
+    Newspaper.publish(:check_cancel, { check: @check })
+
     head :no_content
   end
 

app/controllers/api/followings_controller.rb

@@ -6,7 +6,7 @@ class API::FollowingsController < API::BaseController
   def create
     user = User.find(params[:id])
     watch = params[:watch] == 'true'
-    if current_user.follow(user, watch: watch)
+    if current_user.follow(user, watch:)
       render json: { id: user.id }
     else
       head :bad_request

app/controllers/api/products/unchecked_controller.rb

@@ -21,7 +21,7 @@ def index
                          .list
                          .page(params[:page])
                 end
-    @products = @products.where(checker_id: checker_id) if checker_id.present?
+    @products = @products.where(checker_id:) if checker_id.present?
     @products_grouped_by_elapsed_days = @products.group_by { |product| product.elapsed_days >= 7 ? 7 : product.elapsed_days }
   end
 

app/controllers/api/session_controller.rb

@@ -9,7 +9,7 @@ def create
     user = User.authenticate(params[:login_name], params[:password])
     if user
       token = User.issue_token(id: user.id, email: user.email)
-      render json: { token: token }
+      render json: { token: }
     else
       head :bad_request
     end

app/controllers/api/watches/toggle_controller.rb

@@ -4,7 +4,7 @@ class API::Watches::ToggleController < API::BaseController
   def index
     @watches = Watch.where(
       user: current_user,
-      watchable: watchable
+      watchable:
     )
   end
 
@@ -16,11 +16,11 @@ def create
     )
     if watch_existence
       message = "この#{watchable.class.model_name.human}はWatch済です。"
-      render json: { message: message }, status: :unprocessable_entity
+      render json: { message: }, status: :unprocessable_entity
     else
       watch = Watch.create!(
         user: current_user,
-        watchable: watchable
+        watchable:
       )
       render json: watch
     end

app/controllers/application_controller.rb

@@ -34,7 +34,7 @@ def init_user
   end
 
   def set_available_emojis
-    @available_emojis = Reaction.emojis.map { |key, value| { kind: key, value: value } }
+    @available_emojis = Reaction.emojis.map { |key, value| { kind: key, value: } }
   end
 
   def set_host_for_disk_storage

app/controllers/mentor/courses_controller.rb

@@ -8,7 +8,12 @@ def index
   end
 
   def new
-    @course = Course.new
+    if params[:course_id].present?
+      original_course = Course.find(params[:course_id])
+      @course = Course.new(category_ids: original_course.category_ids)
+    else
+      @course = Course.new
+    end
   end
 
   def edit; end

app/helpers/articles_helper.rb

@@ -8,4 +8,9 @@ def contributor
   def thumbnail_blank?(article)
     !article.thumbnail.attached? && article.thumbnail_type == 'prepared_thumbnail'
   end
+
+  def ogp_image_url(image_url)
+    base_url = "#{request.protocol}#{request.host_with_port}"
+    base_url + image_url
+  end
 end

app/javascript/components/user-activity-count.vue

@@ -0,0 +1,20 @@
+<template lang="pug">
+.card-counts__item
+  .card-counts__item-inner
+    dt.card-counts__item-label
+      | {{ activityName }}
+    dd.card-counts__item-value(:class='activityCount == 0 ? "is-empty" : ""')
+      span(v-if='activityCount == 0')
+        | {{ activityCount }}
+      a.a-text-link(v-else)(:href='activityUrl')
+        | {{ activityCount }}
+</template>
+<script>
+export default {
+  props: {
+    activityName: { type: Object, required: true },
+    activityCount: { type: Object, required: true },
+    activityUrl: { type: Object, required: true }
+  }
+}
+</script>

app/javascript/components/user-activity-counts.vue

@@ -1,44 +1,33 @@
 <template lang="pug">
 .card-counts.is-users.mt-3(v-if='user.student_or_trainee')
   dl.card-counts__items
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 日報
-        dd.card-counts__item-value(
-          :class='user.report_count == 0 ? "is-empty" : ""')
-          | {{ user.report_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 提出物
-        dd.card-counts__item-value(
-          :class='user.product_count == 0 ? "is-empty" : ""')
-          | {{ user.product_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | コメント
-        dd.card-counts__item-value(
-          :class='user.comment_count == 0 ? "is-empty" : ""')
-          | {{ user.comment_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 質問
-        dd.card-counts__item-value(
-          :class='user.question_count == 0 ? "is-empty" : ""')
-          | {{ user.question_count }}
-    .card-counts__item
-      .card-counts__item-inner
-        dt.card-counts__item-label
-          | 回答
-        dd.card-counts__item-value(
-          :class='user.answer_count == 0 ? "is-empty" : ""')
-          | {{ user.answer_count }}
+    user-activity-count(
+      activity-name='日報',
+      :activity-count='user.report_count',
+      :activity-url='`${user.url}/reports`')
+    user-activity-count(
+      activity-name='提出物',
+      :activity-count='user.product_count',
+      :activity-url='`${user.url}/products`')
+    user-activity-count(
+      activity-name='コメント',
+      :activity-count='user.comment_count',
+      :activity-url='`${user.url}/comments`')
+    user-activity-count(
+      activity-name='質問',
+      :activity-count='user.question_count',
+      :activity-url='`${user.url}/questions`')
+    user-activity-count(
+      activity-name='回答',
+      :activity-count='user.answer_count',
+      :activity-url='`${user.url}/answers`')
 </template>
 <script>
+import UserActivityCount from './user-activity-count.vue'
 export default {
+  components: {
+    'user-activity-count': UserActivityCount
+  },
   props: {
     user: { type: Object, required: true }
   }

app/javascript/markdown-it-container-speak.js

@@ -11,7 +11,7 @@ export default (md) => {
         return `<div class="speak">
                   <div class="speak__speaker">
                     <a href="/users/${speakerName}" class="a-user-emoji-link">
-                      <img class="js-user-icon a-user-emoji" data-user="${speakerName}">
+                      <img title="@${speakerName}" class="js-user-icon a-user-emoji" data-user="${speakerName}">
                       <spanv class="speak__speaker-name">${speakerName}</span>
                     </a>
                   </div>

app/javascript/markdown-it-user-icon.js

@@ -4,6 +4,6 @@ export default MarkdownItRegexp(
   /:@(?!mentor:)([a-zA-Z0-9_-]+):/,
 
   (match) => {
-    return `<a href="/users/${match[1]}" class="a-user-emoji-link"><img class="js-user-icon a-user-emoji" data-user="${match[1]}" width="40" height="40"></a>`
+    return `<a href="/users/${match[1]}" class="a-user-emoji-link"><img title="@${match[1]}" class="js-user-icon a-user-emoji" data-user="${match[1]}" width="40" height="40"></a>`
   }
 )

app/javascript/stylesheets/shared/blocks/card/_card-footer.sass

@@ -1,6 +1,7 @@
 .card-footer
+  container: card-footer / inline-size
   +media-breakpoint-up(md)
-    padding: .5rem 1.25rem
+    padding: .5rem 1rem
     min-height: 3rem
   +media-breakpoint-down(sm)
     padding: .5rem .75rem

app/javascript/stylesheets/shared/blocks/card/_card-main-actions.sass

@@ -5,29 +5,29 @@
 .card-main-actions__items
   display: flex
   gap: .75rem
-  +media-breakpoint-up(md)
+  @container card-footer (min-width: 20em)
     +position(relative)
     justify-content: center
     flex-wrap: wrap
     align-items: flex-end
     min-height: 1.875rem
-  +media-breakpoint-down(sm)
+  @container card-footer (max-width: 19.9375em)
     flex-direction: column
   &.is-sub-actions
     justify-content: flex-end
-    +media-breakpoint-down(sm)
+    @container card-footer (max-width: 19.9375em)
       flex-direction: row
     .card-main-actions__item.is-sub
       position: static
       flex: 0 0 auto
 
 .card-main-actions__item
-  +media-breakpoint-up(md)
-    flex: 0 0 12rem
-    max-width: calc(50% - .375rem)
+  @container card-footer (min-width: 20em)
+    flex: 1
+    max-width: 15rem
     &.is-sub
       +position(absolute, right 0, bottom 0)
-  +media-breakpoint-down(sm)
+  @container card-footer (max-width: 19.9375em)
     flex-basis: 100%
     max-width: 100%
     &.is-sub
@@ -37,6 +37,10 @@
   &.is-end
     margin-left: auto
     flex-basis: 2.5rem
+  .card-main-actions.is-3-items &
+    @container card-footer (min-width: 20em)
+      flex: 1 0 0
+
 
 .card-main-actions__muted-action
   +hover-link-reversal