From 088c617cc12be188a51c5840d82cfbc237e741ce Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Tue, 26 Apr 2022 17:15:59 +0800
Subject: [PATCH 01/11] add: name query for branches

---
 app/controllers/projects_controller.rb                     | 2 +-
 app/controllers/pull_requests_controller.rb                | 4 ++--
 app/controllers/version_releases_controller.rb             | 2 +-
 app/services/branches/list_service.rb                      | 7 ++++---
 .../gitea/repository/branches/list_name_service.rb         | 7 ++++---
 app/services/gitea/repository/branches/list_service.rb     | 7 ++++---
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index be9a93d9f..b14b105b8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -88,7 +88,7 @@ class ProjectsController < ApplicationController
     return @branches = [] unless @project.forge?
 
     # result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier)
+    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier, params[:name])
     @branches =  result.is_a?(Hash) ? (result.key?(:status) ? [] : result["branch_name"]) : result
   end
 
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 189c5c6bf..0ac7a7144 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -29,7 +29,7 @@ class PullRequestsController < ApplicationController
   end
 
   def new
-    @all_branches = Branches::ListService.call(@owner, @project)
+    @all_branches = Branches::ListService.call(@owner, @project, params[:branch_name])
     @is_fork = @project.forked_from_project_id.present?
     @projects_names = [{
       project_user_login: @owner.try(:login),
@@ -50,7 +50,7 @@ class PullRequestsController < ApplicationController
   end
 
   def get_branches
-    branch_result = Branches::ListService.call(@owner, @project)
+    branch_result = Branches::ListService.call(@owner, @project, params[:name])
     render json: branch_result
     # return json: branch_result
   end
diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb
index 2d7546a1c..dd59098f7 100644
--- a/app/controllers/version_releases_controller.rb
+++ b/app/controllers/version_releases_controller.rb
@@ -14,7 +14,7 @@ class VersionReleasesController < ApplicationController
   def new
     #获取所有的分支
     @all_branches = []
-    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier)).call
+    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @repository.try(:identifier), params[:branch_name]).call
     if get_all_branches && get_all_branches.size > 0
       get_all_branches.each do |b|
         @all_branches.push(b["name"])
diff --git a/app/services/branches/list_service.rb b/app/services/branches/list_service.rb
index a3b77a7b0..7b47658e3 100644
--- a/app/services/branches/list_service.rb
+++ b/app/services/branches/list_service.rb
@@ -1,17 +1,18 @@
 class Branches::ListService < ApplicationService
 
-  attr_reader :user, :project
+  attr_reader :user, :project, :name
 
-  def initialize(user, project)
+  def initialize(user, project, name=nil)
     @user = user
     @project = project
+    @name = name
   end
 
   def call
     all_branches = []
     user_name = user.try(:show_real_name)
     identifier = project.repository.try(:identifier)
-    get_all_branches = Gitea::Repository::Branches::ListService.new(user, identifier).call
+    get_all_branches = Gitea::Repository::Branches::ListService.new(user, identifier, name).call
     all_branches = branch_lists(user_name,user.try(:login), identifier, get_all_branches) if get_all_branches && get_all_branches.size > 0
     return all_branches
   end
diff --git a/app/services/gitea/repository/branches/list_name_service.rb b/app/services/gitea/repository/branches/list_name_service.rb
index 716ee464c..c005c8359 100644
--- a/app/services/gitea/repository/branches/list_name_service.rb
+++ b/app/services/gitea/repository/branches/list_name_service.rb
@@ -1,9 +1,10 @@
 class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
-  attr_reader :user, :repo
+  attr_reader :user, :repo, :name
 
-  def initialize(user, repo)
+  def initialize(user, repo, name=nil)
     @user = user
     @repo = repo
+    @name = name
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: user.gitea_token, name: name)
   end
 
   def url
diff --git a/app/services/gitea/repository/branches/list_service.rb b/app/services/gitea/repository/branches/list_service.rb
index f42965098..7722ecd0b 100644
--- a/app/services/gitea/repository/branches/list_service.rb
+++ b/app/services/gitea/repository/branches/list_service.rb
@@ -1,9 +1,10 @@
 class Gitea::Repository::Branches::ListService < Gitea::ClientService
-  attr_reader :user, :repo
+  attr_reader :user, :repo, :name
 
-  def initialize(user, repo)
+  def initialize(user, repo, name=nil)
     @user = user
     @repo = repo
+    @name = name
   end
 
   def call
@@ -13,7 +14,7 @@ class Gitea::Repository::Branches::ListService < Gitea::ClientService
 
   private
   def params
-    Hash.new.merge(token: user.gitea_token)
+    Hash.new.merge(token: user.gitea_token, name: name)
   end
 
   def url

From 396ac55429d37e72d56fd505258e9900f2c4f7e7 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 10:42:55 +0800
Subject: [PATCH 02/11] add: user super description

---
 app/controllers/users_controller.rb           |  1 +
 app/models/user.rb                            |  2 +-
 app/models/user_extension.rb                  | 57 +++++++++----------
 app/views/users/get_user_info.json.jbuilder   |  3 +-
 app/views/users/show.json.jbuilder            |  1 +
 ...dd_super_description_to_user_extensions.rb |  6 ++
 6 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 db/migrate/20220428015313_add_super_description_to_user_extensions.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index acc826614..532f29ba1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -313,6 +313,7 @@ class UsersController < ApplicationController
                                   :occupation, :technical_title,
                                   :school_id, :department_id, :province, :city,
                                   :custom_department, :identity, :student_id, :description,
+                                  :show_super_description, :super_description,
                                   :show_email, :show_location, :show_department]
                                 )
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index d661ab591..fa940c29e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -187,7 +187,7 @@ class User < Owner
   attr_accessor :password, :password_confirmation
 
   delegate :description, :gender, :department_id, :school_id, :location, :location_city,
-           :show_email, :show_location, :show_department,
+           :show_email, :show_location, :show_department, :super_description, :show_super_description,
            :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
 
   before_save :update_hashed_password, :set_lastname
diff --git a/app/models/user_extension.rb b/app/models/user_extension.rb
index ee208af7e..379243bf8 100644
--- a/app/models/user_extension.rb
+++ b/app/models/user_extension.rb
@@ -2,35 +2,34 @@
 #
 # Table name: user_extensions
 #
-#  id                 :integer          not null, primary key
-#  user_id            :integer          not null
-#  birthday           :date
-#  brief_introduction :string(255)
-#  gender             :integer
-#  location           :string(255)
-#  occupation         :string(255)
-#  work_experience    :integer
-#  zip_code           :integer
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  technical_title    :string(255)
-#  identity           :integer
-#  student_id         :string(255)
-#  teacher_realname   :string(255)
-#  student_realname   :string(255)
-#  location_city      :string(255)
-#  school_id          :integer
-#  description        :string(255)      default("")
-#  department_id      :integer
-#  honor              :text(65535)
-#  edu_background     :integer
-#  edu_entry_year     :integer
-#  province           :string(255)
-#  city               :string(255)
-#  custom_department  :string(255)
-#  show_email         :boolean          default("0")
-#  show_location      :boolean          default("0")
-#  show_department    :boolean          default("0")
+#  id                     :integer          not null, primary key
+#  user_id                :integer          not null
+#  birthday               :date
+#  brief_introduction     :string(255)
+#  gender                 :integer
+#  location               :string(255)
+#  occupation             :string(255)
+#  work_experience        :integer
+#  zip_code               :integer
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  technical_title        :string(255)
+#  identity               :integer
+#  student_id             :string(255)
+#  teacher_realname       :string(255)
+#  student_realname       :string(255)
+#  location_city          :string(255)
+#  school_id              :integer
+#  description            :string(255)      default("")
+#  department_id          :integer
+#  province               :string(255)
+#  city                   :string(255)
+#  custom_department      :string(255)
+#  show_email             :boolean          default("0")
+#  show_location          :boolean          default("0")
+#  show_department        :boolean          default("0")
+#  super_description      :text(4294967295)
+#  show_super_description :boolean
 #
 # Indexes
 #
diff --git a/app/views/users/get_user_info.json.jbuilder b/app/views/users/get_user_info.json.jbuilder
index 5fa4df167..8fcadb1c8 100644
--- a/app/views/users/get_user_info.json.jbuilder
+++ b/app/views/users/get_user_info.json.jbuilder
@@ -21,5 +21,6 @@ json.province @user.province
 json.city @user.city
 json.custom_department @user.custom_department
 json.description @user.description
-json.(@user, :show_email, :show_department, :show_location)
+json.super_description @user.super_description
+json.(@user, :show_email, :show_department, :show_location, :show_super_description)
 json.message_unread_total @message_unread_total
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
index 1c9e7793f..f35705ce6 100644
--- a/app/views/users/show.json.jbuilder
+++ b/app/views/users/show.json.jbuilder
@@ -13,4 +13,5 @@ json.email @user.show_email ? @user.mail : nil
 json.province @user.show_location ? @user.province : nil
 json.city @user.show_location ? @user.city : nil
 json.custom_department @user.show_department ? @user.custom_department : nil
+json.super_description @user.show_super_description ? @user.super_description : nil
 json.description @user.description
\ No newline at end of file
diff --git a/db/migrate/20220428015313_add_super_description_to_user_extensions.rb b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
new file mode 100644
index 000000000..076516779
--- /dev/null
+++ b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
@@ -0,0 +1,6 @@
+class AddSuperDescriptionToUserExtensions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_extensions, :super_description, :text, :limit => 4294967295
+    add_column :user_extensions, :show_super_description, :boolean
+  end
+end

From ec3a556a6f31fb162d47db88c88ba0e3f99f2c34 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 11:03:42 +0800
Subject: [PATCH 03/11] fix: default value for show super description

---
 app/models/user_extension.rb                                    | 2 +-
 .../20220428015313_add_super_description_to_user_extensions.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user_extension.rb b/app/models/user_extension.rb
index 379243bf8..c1046ac2f 100644
--- a/app/models/user_extension.rb
+++ b/app/models/user_extension.rb
@@ -29,7 +29,7 @@
 #  show_location          :boolean          default("0")
 #  show_department        :boolean          default("0")
 #  super_description      :text(4294967295)
-#  show_super_description :boolean
+#  show_super_description :boolean          default("0")
 #
 # Indexes
 #
diff --git a/db/migrate/20220428015313_add_super_description_to_user_extensions.rb b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
index 076516779..3e00416e9 100644
--- a/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
+++ b/db/migrate/20220428015313_add_super_description_to_user_extensions.rb
@@ -1,6 +1,6 @@
 class AddSuperDescriptionToUserExtensions < ActiveRecord::Migration[5.2]
   def change
     add_column :user_extensions, :super_description, :text, :limit => 4294967295
-    add_column :user_extensions, :show_super_description, :boolean
+    add_column :user_extensions, :show_super_description, :boolean, default: false
   end
 end

From 3abd6037d99e16931f6ad44ece25d004ec28cf9e Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 11:12:16 +0800
Subject: [PATCH 04/11] fix: show super description aways desplay

---
 app/views/users/show.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
index f35705ce6..dfeb45cfe 100644
--- a/app/views/users/show.json.jbuilder
+++ b/app/views/users/show.json.jbuilder
@@ -14,4 +14,5 @@ json.province @user.show_location ? @user.province : nil
 json.city @user.show_location ? @user.city : nil
 json.custom_department @user.show_department ? @user.custom_department : nil
 json.super_description @user.show_super_description ? @user.super_description : nil
+json.show_super_description @user.show_super_description
 json.description @user.description
\ No newline at end of file

From f15cd44dff87a2df8072133140fa7f2c787a4c13 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 28 Apr 2022 18:53:33 +0800
Subject: [PATCH 05/11] add: compare add paginate

---
 app/controllers/compare_controller.rb | 12 ++++++++++++
 app/helpers/repositories_helper.rb    |  1 -
 app/views/compare/show.json.jbuilder  |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/compare_controller.rb b/app/controllers/compare_controller.rb
index 382e7506e..1aab7adbe 100644
--- a/app/controllers/compare_controller.rb
+++ b/app/controllers/compare_controller.rb
@@ -9,6 +9,10 @@ class CompareController < ApplicationController
     load_compare_params
     compare
     @merge_status, @merge_message = get_merge_message
+    @page_size = page_size <= 0 ? 1 : page_size
+    @page_limit = page_limit <=0 ? 15 : page_limit
+    @page_offset = (@page_size -1) * @page_limit
+    Rails.logger.info("+========#{@page_size}-#{@page_limit}-#{@page_offset}")
   end
 
   private
@@ -53,4 +57,12 @@ class CompareController < ApplicationController
   def gitea_compare(base, head)
     Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, Addressable::URI.escape(base), Addressable::URI.escape(head), current_user.gitea_token)
   end
+
+  def page_size 
+    params.fetch(:page, 1).to_i
+  end
+
+  def page_limit
+    params.fetch(:limit, 15).to_i
+  end
 end
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index e6e7e87f8..b8bfc31cd 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -36,7 +36,6 @@ module RepositoriesHelper
   end
 
   def render_cache_commit_author(author_json)
-    Rails.logger.info author_json['Email'] 
     if author_json["name"].present? && author_json["email"].present?
       return find_user_in_redis_cache(author_json['name'], author_json['email']) 
     end
diff --git a/app/views/compare/show.json.jbuilder b/app/views/compare/show.json.jbuilder
index deca41037..26a7cb769 100644
--- a/app/views/compare/show.json.jbuilder
+++ b/app/views/compare/show.json.jbuilder
@@ -1,7 +1,7 @@
-json.commits_count @compare_result['Commits']&.size
+json.commits_count @compare_result['CommitsCount']
 # json.commits @compare_result['Commits'], partial: 'pull_requests/commit', as: :commit
 json.commits do
-  json.array! @compare_result['Commits'] do |commit|
+  json.array! @compare_result['Commits'][@page_offset...(@page_offset + @page_limit)] do |commit|
     json.author do
       json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
     end

From 7c88ea3d6713065f29421d025288947a5194b11b Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Thu, 5 May 2022 10:00:02 +0800
Subject: [PATCH 06/11] add: quit repo

---
 app/controllers/projects_controller.rb | 21 ++++++++++++++++++++-
 config/routes.rb                       |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b14b105b8..c4e440aff 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -13,6 +13,8 @@ class ProjectsController < ApplicationController
   def menu_list
     menu = []
 
+    user_is_admin = current_user.admin? || @project.manager?(current_user)
+
     menu.append(menu_hash_by_name("home"))
     menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
     menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
@@ -22,7 +24,8 @@ class ProjectsController < ApplicationController
     menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
     menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
     menu.append(menu_hash_by_name("activity"))
-    menu.append(menu_hash_by_name("settings")) if (current_user.admin? || @project.manager?(current_user)) && @project.forge?
+    menu.append(menu_hash_by_name("settings")) if user_is_admin && @project.forge?
+    menu.append(menu_hash_by_name("quit")) if !user_is_admin && @project.member(current_user.id) && @project.forge?
 
     render json: menu
   end
@@ -177,6 +180,22 @@ class ProjectsController < ApplicationController
     tip_exception(e.message)
   end
 
+  def quit
+    user_is_admin = current_user.admin? || @project.manager?(current_user)
+    if !user_is_admin && @project.member(current_user.id) && @project.forge? 
+      ActiveRecord::Base.transaction do
+        Projects::DeleteMemberInteractor.call(@project.owner, @project, current_user)
+        SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, current_user.id, @project.id) if Site.has_notice_menu?
+        render_ok
+      end
+    else 
+      render_forbidden('你不能退出该仓库')
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
   def watch_users
     watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct
     @watchers_count = watchers.size
diff --git a/config/routes.rb b/config/routes.rb
index da63dab64..01ff4fa3c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -436,6 +436,7 @@ Rails.application.routes.draw do
           get :stargazers, to: 'projects#praise_users'
           get :forks, to: 'projects#fork_users'
           match :about, :via => [:get, :put, :post]
+          post :quit
         end
       end
 

From 55c74de8e46c59ec353593fe7bd92543c2688d26 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Thu, 5 May 2022 10:41:02 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fork=5Fusers=E5=8A=A0=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/fork_user.rb                      | 2 +-
 app/services/pull_requests/create_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb
index bddf8f75c..4177392ee 100644
--- a/app/models/fork_user.rb
+++ b/app/models/fork_user.rb
@@ -17,7 +17,7 @@
 
 class ForkUser < ApplicationRecord
   belongs_to :project
-  belongs_to :user
+  belongs_to :owner
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb
index 703bb5de3..258d0e31b 100644
--- a/app/services/pull_requests/create_service.rb
+++ b/app/services/pull_requests/create_service.rb
@@ -157,7 +157,7 @@ class PullRequests::CreateService < ApplicationService
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
     raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
-    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:user).where(users: {login: @params[:merge_user_login]}).blank?
+    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:owner).where(users: {login: @params[:merge_user_login]}).blank?
     raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
     raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?

From 676024b6db09b7f535f07a68f795e85397ff65fb Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Thu, 5 May 2022 10:42:08 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fork=5Fusers=E5=8A=A0=E5=85=A5=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/fork_user.rb                      | 2 +-
 app/services/pull_requests/create_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/fork_user.rb b/app/models/fork_user.rb
index bddf8f75c..4177392ee 100644
--- a/app/models/fork_user.rb
+++ b/app/models/fork_user.rb
@@ -17,7 +17,7 @@
 
 class ForkUser < ApplicationRecord
   belongs_to :project
-  belongs_to :user
+  belongs_to :owner
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id
 
   after_create :incre_project_common, :incre_user_statistic, :incre_platform_statistic
diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb
index 703bb5de3..258d0e31b 100644
--- a/app/services/pull_requests/create_service.rb
+++ b/app/services/pull_requests/create_service.rb
@@ -157,7 +157,7 @@ class PullRequests::CreateService < ApplicationService
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
     raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
-    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:user).where(users: {login: @params[:merge_user_login]}).blank?
+    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:owner).where(users: {login: @params[:merge_user_login]}).blank?
     raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
     raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?

From ae7d0d13296e595a9a3e2fa52b627d6d41d023f0 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 6 May 2022 09:56:22 +0800
Subject: [PATCH 09/11] add: issues description and journals notes validate

---
 app/controllers/issues_controller.rb              |  4 ++--
 app/controllers/journals_controller.rb            | 11 +++++++++--
 app/forms/issues/create_form.rb                   |  4 ++--
 app/forms/issues/update_form.rb                   |  4 +++-
 app/forms/journals/create_form.rb                 |  7 +++++++
 app/forms/journals/update_form.rb                 |  8 ++++++++
 config/locales/forms/create_issuse_form.zh-CN.yml |  8 +++++++-
 7 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 app/forms/journals/create_form.rb
 create mode 100644 app/forms/journals/update_form.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b546ea717..e21c087bf 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -109,7 +109,7 @@ class IssuesController < ApplicationController
 
   def create
     issue_params = issue_send_params(params)
-    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
+    Issues::CreateForm.new(issue_params.slice(:subject, :description)).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
       SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
@@ -223,7 +223,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
+      Issues::UpdateForm.new(issue_params.slice(:subject, :description)).validate!
       if @issue.update_attributes(issue_params)
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 8fbe46924..2dd1fef69 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,6 +23,7 @@ class JournalsController < ApplicationController
       normal_status(-1, "评论内容不能为空")
     else
       ActiveRecord::Base.transaction do
+        Journals::CreateForm.new({notes: notes.to_s.strip}).validate!
         journal_params = {
           journalized_id: @issue.id ,
           journalized_type: "Issue",
@@ -53,6 +54,9 @@ class JournalsController < ApplicationController
         end
       end
     end
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def destroy
@@ -70,7 +74,8 @@ class JournalsController < ApplicationController
 
   def update
     content = params[:content]
-    if content.present?
+    if content.present? 
+      Journals::UpdateForm.new({notes: notes.to_s.strip}).validate!
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
@@ -79,7 +84,9 @@ class JournalsController < ApplicationController
     else
       normal_status(-1, "评论的内容不能为空")
     end
-
+  rescue Exception => exception
+    puts exception.message
+    normal_status(-1, exception.message)
   end
 
   def get_children_journals
diff --git a/app/forms/issues/create_form.rb b/app/forms/issues/create_form.rb
index 602775ff4..7ab942bc5 100644
--- a/app/forms/issues/create_form.rb
+++ b/app/forms/issues/create_form.rb
@@ -1,11 +1,11 @@
 class Issues::CreateForm
   include ActiveModel::Model
 
-  attr_accessor :subject
+  attr_accessor :subject, :description
 
   validates :subject, presence: { message: "不能为空" }
 
   validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
 
-
+  validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"}
 end
diff --git a/app/forms/issues/update_form.rb b/app/forms/issues/update_form.rb
index 64acdfb5c..1aa971e98 100644
--- a/app/forms/issues/update_form.rb
+++ b/app/forms/issues/update_form.rb
@@ -1,10 +1,12 @@
 class Issues::UpdateForm
   include ActiveModel::Model
 
-  attr_accessor :subject
+  attr_accessor :subject, :description
 
   validates :subject, presence: { message: "不能为空" }
 
   validates :subject, length: { maximum: 200, too_long: "不能超过200个字符" }
 
+  validates :description, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+
 end
\ No newline at end of file
diff --git a/app/forms/journals/create_form.rb b/app/forms/journals/create_form.rb
new file mode 100644
index 000000000..8b96bc642
--- /dev/null
+++ b/app/forms/journals/create_form.rb
@@ -0,0 +1,7 @@
+class Journals::CreateForm
+  include ActiveModel::Model
+  
+  attr_accessor :notes
+
+  validates :notes, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+end
diff --git a/app/forms/journals/update_form.rb b/app/forms/journals/update_form.rb
new file mode 100644
index 000000000..74f8fa6f4
--- /dev/null
+++ b/app/forms/journals/update_form.rb
@@ -0,0 +1,8 @@
+class Journals::UpdateForm
+  include ActiveModel::Model
+
+  attr_accessor :notes
+
+  validates :notes, length: { maximum: 65535, too_long: "不能超过65535个字符"}
+
+end
\ No newline at end of file
diff --git a/config/locales/forms/create_issuse_form.zh-CN.yml b/config/locales/forms/create_issuse_form.zh-CN.yml
index 643c68667..bebab7e22 100644
--- a/config/locales/forms/create_issuse_form.zh-CN.yml
+++ b/config/locales/forms/create_issuse_form.zh-CN.yml
@@ -3,5 +3,11 @@
     attributes:
       issues/create_form:
         subject: 标题
+        description: 描述
       issues/update_form:
-        subject: 标题
\ No newline at end of file
+        subject: 标题
+        description: 描述
+      journals/create_form:
+        notes: 评论
+      journals/update_form:
+        notes: 评论
\ No newline at end of file

From 6aa3321d17e33a563a373e0c2d0bf32ff73216f1 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 6 May 2022 14:29:05 +0800
Subject: [PATCH 10/11] fix: pr title description validate

---
 app/controllers/pull_requests_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index 0ac7a7144..bb0407845 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -58,6 +58,7 @@ class PullRequestsController < ApplicationController
   def create
     # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     ActiveRecord::Base.transaction do
+      Issues::CreateForm.new({subject: params[:title], description: params}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
@@ -89,7 +90,7 @@ class PullRequestsController < ApplicationController
     else
       ActiveRecord::Base.transaction do
         begin
-          return normal_status(-1, "title不能超过255个字符") if params[:title].length > 255
+          Issues::UpdateForm.new({subject: params[:title], description: params[:body]}).validate!
           merge_params
 
           @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?

From 000197b0d1b723932fbd47bec1fb866cf8449d66 Mon Sep 17 00:00:00 2001
From: yystopf <yystopf@163.com>
Date: Fri, 6 May 2022 17:25:34 +0800
Subject: [PATCH 11/11] fix: issues and pull_request length calculate

---
 app/controllers/issues_controller.rb                       | 4 ++--
 app/controllers/journals_controller.rb                     | 4 ++--
 app/controllers/pull_requests_controller.rb                | 4 ++--
 app/models/journal.rb                                      | 2 +-
 app/models/pull_request.rb                                 | 6 +++---
 ..._change_issues_description_and_journals_notes_column.rb | 7 +++++++
 6 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e21c087bf..ee0b5efff 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -109,7 +109,7 @@ class IssuesController < ApplicationController
 
   def create
     issue_params = issue_send_params(params)
-    Issues::CreateForm.new(issue_params.slice(:subject, :description)).validate!
+    Issues::CreateForm.new({subject: issue_params[:subject], description: issue_params[:description].b}).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
       SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
@@ -223,7 +223,7 @@ class IssuesController < ApplicationController
       normal_status(-1, "不允许修改为关闭状态")
     else
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new(issue_params.slice(:subject, :description)).validate!
+      Issues::UpdateForm.new({subject: issue_params[:subject], description: issue_params[:description].b}).validate!
       if @issue.update_attributes(issue_params)
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 2dd1fef69..7c0676590 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -23,7 +23,7 @@ class JournalsController < ApplicationController
       normal_status(-1, "评论内容不能为空")
     else
       ActiveRecord::Base.transaction do
-        Journals::CreateForm.new({notes: notes.to_s.strip}).validate!
+        Journals::CreateForm.new({notes: notes.to_s.strip.b}).validate!
         journal_params = {
           journalized_id: @issue.id ,
           journalized_type: "Issue",
@@ -75,7 +75,7 @@ class JournalsController < ApplicationController
   def update
     content = params[:content]
     if content.present? 
-      Journals::UpdateForm.new({notes: notes.to_s.strip}).validate!
+      Journals::UpdateForm.new({notes: notes.to_s.strip.b}).validate!
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb
index bb0407845..bf5646a4e 100644
--- a/app/controllers/pull_requests_controller.rb
+++ b/app/controllers/pull_requests_controller.rb
@@ -58,7 +58,7 @@ class PullRequestsController < ApplicationController
   def create
     # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     ActiveRecord::Base.transaction do
-      Issues::CreateForm.new({subject: params[:title], description: params}).validate!
+      Issues::CreateForm.new({subject: params[:title], description: params[:body].b}).validate!
       @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
       if @gitea_pull_request[:status] == :success
         @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
@@ -90,7 +90,7 @@ class PullRequestsController < ApplicationController
     else
       ActiveRecord::Base.transaction do
         begin
-          Issues::UpdateForm.new({subject: params[:title], description: params[:body]}).validate!
+          Issues::UpdateForm.new({subject: params[:title], description: params[:body].b}).validate!
           merge_params
 
           @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
diff --git a/app/models/journal.rb b/app/models/journal.rb
index a1834ae2a..5bf05b0d2 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -6,7 +6,7 @@
 #  journalized_id   :integer          default("0"), not null
 #  journalized_type :string(30)       default(""), not null
 #  user_id          :integer          default("0"), not null
-#  notes            :text(65535)
+#  notes            :text(4294967295)
 #  created_on       :datetime         not null
 #  private_notes    :boolean          default("0"), not null
 #  parent_id        :integer
diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index 7338a1d72..e36af832b 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -3,8 +3,8 @@
 # Table name: pull_requests
 #
 #  id              :integer          not null, primary key
-#  pull_request_id :integer
-#  gpid            :integer
+#  gitea_id        :integer
+#  gitea_number    :integer
 #  user_id         :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
@@ -12,7 +12,7 @@
 #  project_id      :integer
 #  title           :string(255)
 #  milestone       :integer
-#  body            :text(65535)
+#  body            :text(4294967295)
 #  head            :string(255)
 #  base            :string(255)
 #  issue_id        :integer
diff --git a/db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb b/db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb
new file mode 100644
index 000000000..a8b934c7d
--- /dev/null
+++ b/db/migrate/20220506083813_change_issues_description_and_journals_notes_column.rb
@@ -0,0 +1,7 @@
+class ChangeIssuesDescriptionAndJournalsNotesColumn < ActiveRecord::Migration[5.2]
+  def change
+    change_column :issues, :description, :text, :limit => 4294967295
+    change_column :journals, :notes, :text, :limit => 4294967295
+    change_column :pull_requests, :body, :text, :limit => 4294967295
+  end
+end