From 8ac7b6a7e7cb94e028c3b49ddb2e3dd75546a3cd Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 13 Apr 2023 20:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9Awebhook=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 4 ++-- app/models/user.rb | 2 +- .../20230413121129_change_webhook_task_field_character.rb | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20230413121129_change_webhook_task_field_character.rb diff --git a/app/models/project.rb b/app/models/project.rb index 52b729a8..02844c3b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -451,7 +451,7 @@ class Project < ApplicationRecord Jbuilder.new do |project| project.id self.id project.identifier self.identifier - project.name self.name.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + project.name self.name project.description Nokogiri::HTML(self.description).text project.visits self.visits project.praises_count self.praises_count.to_i @@ -475,7 +475,7 @@ class Project < ApplicationRecord project.image_url render_educoder_avatar_url(self.project_educoder) else user = self.owner - project.name user.try(:show_real_name).to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + project.name user.try(:show_real_name) project.type user&.type project.login user.login project.image_url user.get_letter_avatar_url diff --git a/app/models/user.rb b/app/models/user.rb index 874da712..70de1fc6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -862,7 +862,7 @@ class User < Owner def to_builder Jbuilder.new do |user| user.(self, :id, :login) - user.name self.real_name.to_s.each_char.select { |c| c.bytes.first < 240 }.join('') + user.name self.real_name user.email self.mail user.image_url self.get_letter_avatar_url end diff --git a/db/migrate/20230413121129_change_webhook_task_field_character.rb b/db/migrate/20230413121129_change_webhook_task_field_character.rb new file mode 100644 index 00000000..04c86716 --- /dev/null +++ b/db/migrate/20230413121129_change_webhook_task_field_character.rb @@ -0,0 +1,7 @@ +class ChangeWebhookTaskFieldCharacter < ActiveRecord::Migration[5.2] + def change + Gitea::Base.connection.execute("ALTER TABLE `hook_task` MODIFY `payload_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") + Gitea::Base.connection.execute("ALTER TABLE `hook_task` MODIFY `request_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") + Gitea::Base.connection.execute("ALTER TABLE `hook_task` MODIFY `response_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") + end +end