From e72153dd1ae3fc961e7090b1035e8a7abf732d5d Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 5 Jul 2023 18:13:30 +0200 Subject: [PATCH] DEV: Remove unused raw-email code (#22364) This code seems unused, since ~2016? --- .../javascripts/admin/addon/models/incoming-email.js | 4 ---- .../discourse/app/controllers/raw-email.js | 11 ----------- app/controllers/admin/email_controller.rb | 7 ------- config/routes.rb | 1 - 4 files changed, 23 deletions(-) diff --git a/app/assets/javascripts/admin/addon/models/incoming-email.js b/app/assets/javascripts/admin/addon/models/incoming-email.js index 637665f1076..90c244f28af 100644 --- a/app/assets/javascripts/admin/addon/models/incoming-email.js +++ b/app/assets/javascripts/admin/addon/models/incoming-email.js @@ -34,8 +34,4 @@ export default class IncomingEmail extends EmberObject { incomings.map((incoming) => IncomingEmail.create(incoming)) ); } - - static loadRawEmail(id) { - return ajax(`/admin/email/incoming/${id}/raw.json`); - } } diff --git a/app/assets/javascripts/discourse/app/controllers/raw-email.js b/app/assets/javascripts/discourse/app/controllers/raw-email.js index b2a5a8ec1e9..103c4574ce1 100644 --- a/app/assets/javascripts/discourse/app/controllers/raw-email.js +++ b/app/assets/javascripts/discourse/app/controllers/raw-email.js @@ -1,5 +1,4 @@ import Controller from "@ember/controller"; -import IncomingEmail from "admin/models/incoming-email"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import Post from "discourse/models/post"; import { equal } from "@ember/object/computed"; @@ -30,16 +29,6 @@ export default Controller.extend(ModalFunctionality, { ); }, - loadIncomingRawEmail(incomingEmailId) { - return IncomingEmail.loadRawEmail(incomingEmailId).then((result) => - this.setProperties({ - rawEmail: result.raw_email, - textPart: result.text_part, - htmlPart: result.html_part, - }) - ); - }, - actions: { displayRaw() { this.set("tab", "raw"); diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index b165827f4d0..779bd875829 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -177,13 +177,6 @@ class Admin::EmailController < Admin::AdminController end end - def raw_email - params.require(:id) - incoming_email = IncomingEmail.find(params[:id].to_i) - text, html = Email.extract_parts(incoming_email.raw) - render json: { raw_email: incoming_email.raw, text_part: text, html_part: html } - end - def incoming params.require(:id) incoming_email = IncomingEmail.find(params[:id].to_i) diff --git a/config/routes.rb b/config/routes.rb index 11b9b1fa379..0f25e262745 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -183,7 +183,6 @@ Discourse::Application.routes.draw do get "bounced" get "received" get "rejected" - get "/incoming/:id/raw" => "email#raw_email" get "/incoming/:id" => "email#incoming" get "/incoming_from_bounced/:id" => "email#incoming_from_bounced" get "preview-digest" => "email#preview_digest"