Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/portal/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tryghost/portal",
"version": "2.64.16",
"version": "2.65.0",
"license": "MIT",
"repository": "https://github.com/TryGhost/Ghost",
"author": "Ghost Foundation",
Expand Down
10 changes: 9 additions & 1 deletion apps/portal/src/components/common/inbox-link-button.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion ghost/core/core/server/lib/get-inbox-links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import logging from '@tryghost/logging';

type GetLinkFn = (options: Readonly<{recipient: string; sender: string}>) => string;

type ProviderName = 'gmail' | 'yahoo' | 'outlook' | 'proton' | 'icloud' | 'hey' | 'aol' | 'mailru' | 'dev-mailpit';
type ProviderName = 'gmail' | 'yahoo' | 'outlook' | 'proton' | 'icloud' | 'hey' | 'aol' | 'mailru' | 'feedbin' | 'dev-mailpit';

type Provider = {
name: ProviderName;
Expand Down Expand Up @@ -120,6 +120,12 @@ const PROVIDERS: ReadonlyArray<Provider> = [
getDesktopLink: ({sender}) => buildUrl('https://e.mail.ru/search/', 'q_from', sender),
getAndroidLink: () => getAndroidIntentUrl('ru.mail.mailapp', 'https://e.mail.ru/')
},
{
name: 'feedbin',
domains: ['feedb.in'],
getDesktopLink: () => 'https://feedbin.com/',
getAndroidLink: () => 'https://feedbin.com/'
},
...(process.env.NODE_ENV === 'development' ? [{
name: 'dev-mailpit' as const,
domains: ['example.com'],
Expand Down
2 changes: 1 addition & 1 deletion ghost/core/core/shared/config/defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
},
"portal": {
"url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
"version": "2.64"
"version": "2.65"
},
"sodoSearch": {
"url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
Expand Down
11 changes: 11 additions & 0 deletions ghost/core/test/unit/server/lib/get-inbox-links.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@ describe('getInboxLinks', function () {
assert(result?.android.includes('browser_fallback_url'));
});

it('handles Feedbin emails', async function () {
const result = await getInboxLinks({
recipient: 'example@feedb.in',
sender: 'sender@example.com',
dnsResolver: resolverThatShouldNeverBeUsed
});
assert.equal(result?.provider, 'feedbin');
assert.equal(result?.desktop, 'https://feedbin.com/');
assert.equal(result?.android, 'https://feedbin.com/');
});

describe('DNS lookups', function () {
it('returns undefined if the MX resolution fails for any reason', async function () {
const errors = [
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/af/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "As u weer ingeskryf is, en u sien steeds nie e-posse in u posbus nie, kontroleer u spam vouer. Sommige posbusverskaffers hou 'n rekord van vorige spam klagtes en sal steeds e-posse merk. As dit gebeur, merk die nuutste nuusbrief as 'Not spam' om dit terug te skuif na u primêre posbus.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/ar/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": ".بمجرد إعادة الاشتراك، إذا كنت لا تزال لا ترى الرسائل في صندوق الوارد الخاص بك تحقق من مجلد البريد المزعج. بعض مزودي الخدمة يحتفظون بسجل للشكاوى السابقة المتعلقة بالبريد المزعج وسوف يستمرون في وضع العلامات على الرسائل. إذا حدث ذلك، قم بوضع علامة على النشرة الإخبارية الأخيرة كـ (ليس بريدًا مزعجًا) لإعادتها إلى صندوق الوارد الرئيسي",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/bg/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "След като се абонирате отново, ако все още не получавате имейли, проверете папката за спам. Някои доставчици пазят история с предишни оплаквания за спам и ще продължат да маркират имейлите. Ако вашият случай е такъв, маркирайте последния бюлетин като 'Не е спам', за да го преместите обратно в основната си папка.",
"Open AOL Mail": "Отворете AOL Mail",
"Open email": "Отворете имейла си",
"Open Feedbin": "",
"Open Gmail": "Отворете Gmail",
"Open Hey": "Отворете Hey",
"Open iCloud Mail": "Отворете iCloud Mail",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/bn/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "একবার পুনঃসাবস্ক্রাইব করার পর, যদি আপনি এখনও আপনার ইনবক্সে ইমেল না দেখেন, তবে আপনার স্প্যাম ফোল্ডার চেক করুন। কিছু ইনবক্স প্রোভাইডার পূর্ববর্তী স্প্যাম অভিযোগগুলির একটি রেকর্ড রাখে এবং ইমেলগুলি চিহ্নিত করতে থাকে। যদি এটি ঘটে, তাহলে সর্বশেষ নিউজলেটারটিকে 'স্প্যাম নয়' হিসাবে চিহ্নিত করুন যাতে এটি আপনার প্রাথমিক ইনবক্সে ফিরে যায়।",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/bs/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Nakon što se ponovno pretplatite, ako još uvijek ne vidiš Email u svom inboxu, provjeri spam folder. Neki pružatelji Email usluga čuvaju zapis prethodnih pritužbi na spam i nastavit će ih označavati kao takve. Ako se to dogodi, označite najnoviji newsletter Email kao \"Nije neželjena pošta\" da biste ga vratili u primarni inbox.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/ca/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Un cop et tornis a subscriure, si encara no reps correus electrònics a la teva safata d'entrada, comprova la carpeta de correu brossa. Alguns proveïdors de correu mantenen un registre de les queixes de correu brossa anteriors i continuaran marcant els correus electrònics com a tal. Si això passa, marca el darrer butlletí com a \"No és correu brossa\". ' per tornar-lo a moure a la safata d'entrada principal.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/context.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
"One hour ago": "Time a comment was placed",
"One min ago": "Time since a comment was made",
"Open AOL Mail": "Shown on signup and signin if your email is detected as AOL Mail",
"Open Feedbin": "",
"Open Gmail": "Shown on signup and signin if your email is detected as Gmail",
"Open Hey": "Shown on signup and signin if your email is detected as Hey",
"Open Mail.ru": "Shown on signup and signin if your email is detected as Mail.ru",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/cs/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Po opětovném přihlášení, pokud stále nevidíte e-maily ve své schránce, zkontrolujte složku spam. Někteří poskytovatelé e-mailových schránek si uchovávají záznam o předchozích stížnostech na spam a budou nadále označovat e-maily. Pokud k tomu dojde, označte nejnovější newsletter jako 'Není spam', aby se přesunul zpět do vaší hlavní schránky.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/da/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Når du har tilmeldt dig igen, hvis du stadig ikke kan se e-mails i din indbakke, skal du tjekke din spam-mappe. Nogle e-mailudbydere registrerer tidligere spam-klager og vil blive ved med at markere e-mails. Hvis dette sker, skal du markere det seneste nyhedsbrev som 'Ikke spam' for at flytte det tilbage til din primære indbakke.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/de-CH/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Wenn Sie nach Ihrer Registrierung keine E-Mail von uns im Posteingang haben, überprüfen Sie Ihren Spam-Ordner. Einige E-Mail-Anbieter speichern frühere Spam-Beschwerden und kennzeichnen E-Mails weiterhin. Für diesen Fall markieren Sie den neusten Newsletter als \"Kein Spam\", um ihn in Ihren Posteingang zu verschieben.",
"Open AOL Mail": "AOL Mail öffnen",
"Open email": "E-Mail öffnen",
"Open Feedbin": "",
"Open Gmail": "Gmail öffnen",
"Open Hey": "Hey öffnen",
"Open iCloud Mail": "iCloud Mail öffnen",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/de/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Wenn du nach der Registrierung immer noch keine E-Mails in deinem Posteingang siehst, überprüfen deinen Spam-Ordner. Einige E-Mail-Anbieter speichern frühere Spam-Beschwerden und kennzeichnen E-Mails weiterhin. Wenn dies der Fall ist, markiere den neuesten Newsletter als \"Kein Spam\", um ihn wieder in deinen Posteingang zu verschieben.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/el/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "Μόλις εγγραφείτε ξανά, αν εξακολουθείτε να μην βλέπετε emails στα εισερχόμενά σας, ελέγξτε τον φάκελο ανεπιθύμητης αλληλογραφίας. Ορισμένοι πάροχοι εισερχομένων διατηρούν αρχείο προηγούμενων αναφορών ανεπιθύμητης αλληλογραφίας και θα συνεχίσουν να επισημαίνουν emails. Αν συμβεί αυτό, επισημάνετε το τελευταίο ενημερωτικό δελτίο ως 'Μη ανεπιθύμητο' για να το μετακινήσετε ξανά στα κύρια εισερχόμενά σας.",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
1 change: 1 addition & 0 deletions ghost/i18n/locales/en/portal.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"Once resubscribed, if you still don't see emails in your inbox, check your spam folder. Some inbox providers keep a record of previous spam complaints and will continue to flag emails. If this happens, mark the latest newsletter as 'Not spam' to move it back to your primary inbox.": "",
"Open AOL Mail": "",
"Open email": "",
"Open Feedbin": "",
"Open Gmail": "",
"Open Hey": "",
"Open iCloud Mail": "",
Expand Down
Loading
Loading