Progress

app/controllers/settings/profiles_controller.rb

@@ -20,7 +20,13 @@ class Settings::ProfilesController < Settings::BaseController
     if @account.is_verified && params[:account][:display_name] && @account.display_name != params[:account][:display_name]
       flash[:alert] = 'Unable to change Display name for verified account'
       redirect_to settings_profile_path
+    elsif !@account.is_pro && params[:account][:username] && @account.username != params[:account][:username]
+      flash[:alert] = 'Unable to change username for your account. You are not GabPRO'
+      redirect_to settings_profile_path
     else
+      # : todo :
+      # only allowed to change username once per day
+
       if UpdateAccountService.new.call(@account, account_params)
         redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
       else
@@ -33,7 +39,7 @@ class Settings::ProfilesController < Settings::BaseController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :username, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
   end
 
   def set_account

app/controllers/settings/promotions_controller.rb

@@ -46,11 +46,11 @@ class Settings::PromotionsController < Admin::BaseController
 		@promotion = Promotion.find(params[:id])
 	end
 
-    def set_filter_params
-      @filter_params = filter_params.to_hash.symbolize_keys
-    end
+	def set_filter_params
+		@filter_params = filter_params.to_hash.symbolize_keys
+	end
 
-    def resource_params
-      params.require(:promotion).permit(:expires_at, :status_id, :timeline_id, :position)
-    end
+	def resource_params
+		params.require(:promotion).permit(:expires_at, :status_id, :timeline_id, :position)
+	end
 end

app/controllers/settings/trending_hashtags_controller.rb

@@ -0,0 +1,10 @@
+class Settings::TrendingHashtagsController < Admin::BaseController
+	def index
+    @trending_hashtags = Redis.current.get("admin_trending_hashtags") || ''
+	end
+
+  def create
+    Redis.current.set("admin_trending_hashtags", params[:trending_hashtags])
+		redirect_to settings_trending_hashtags_path
+	end
+end

app/controllers/settings/verifications/moderation_controller.rb

@@ -1,10 +1,10 @@
 class Settings::Verifications::ModerationController < Admin::BaseController
 	def index
-		@verification_requests = AccountVerificationRequest.all
+		@verification_requests = AccountVerificationRequest.order('created_at DESC').all
 	end
 
 	def approve
-		verification_request = AccountVerificationRequest.find params[:id]
+		verification_request = AccountVerificationRequest.find(params[:id])
 		
 		# Mark user as verified
 		account = verification_request.account
@@ -22,6 +22,8 @@ class Settings::Verifications::ModerationController < Admin::BaseController
 	end
 
 	def reject
-		@verification_requests = AccountVerificationRequest.find params[:id]
+		verification_request = AccountVerificationRequest.find(params[:id])
+		verification_request.destroy()
+		redirect_to settings_verifications_moderation_url, notice: I18n.t('verifications.moderation.rejected_msg')
 	end
 end