diff --git a/block/contDanger.js b/block/contDanger.js index 1a6affa..857cfa2 100644 --- a/block/contDanger.js +++ b/block/contDanger.js @@ -10,7 +10,7 @@ function convert(string, plain) { let start = string.indexOf(conf.open); let end = string.indexOf(conf.close, start + conf.open.length); let ogText = string.substring(start, end + conf.close.length); - let str = `${ogText.replace(`${conf.open} `, '').replace(` ${conf.close}`, '')}` + let str = `${ogText.replace(`${conf.open}`, '').replace(`${conf.close}`, '')}` let content = `${str}`; string = string.replace(ogText, content) return string; diff --git a/block/contInfo.js b/block/contInfo.js index 3595587..dccf540 100644 --- a/block/contInfo.js +++ b/block/contInfo.js @@ -10,11 +10,9 @@ function convert(string, plain) { let start = string.indexOf(conf.open); let end = string.indexOf(conf.close, start + conf.open.length); let ogText = string.substring(start, end + conf.close.length); - let str = `${ogText.replace(`${conf.open} `, '').replace(` ${conf.close}`, '')}` + let str = `${ogText.replace(`${conf.open}`, '').replace(`${conf.close}`, '')}` let content = `${str}`; string = string.replace(ogText, content) - // console.log(string) - // process.exit(0); return string; } diff --git a/block/contPrimary.js b/block/contPrimary.js index b39f9fc..433edd2 100644 --- a/block/contPrimary.js +++ b/block/contPrimary.js @@ -10,7 +10,7 @@ function convert(string, plain) { let start = string.indexOf(conf.open); let end = string.indexOf(conf.close, start + conf.open.length); let ogText = string.substring(start, end + conf.close.length); - let str = `${ogText.replace(`${conf.open} `, '').replace(` ${conf.close}`, '')}` + let str = `${ogText.replace(`${conf.open}`, '').replace(`${conf.close}`, '')}` let content = `${str}`; string = string.replace(ogText, content) return string; diff --git a/block/contSuccess.js b/block/contSuccess.js index 6b0691c..ba9f79c 100644 --- a/block/contSuccess.js +++ b/block/contSuccess.js @@ -10,7 +10,7 @@ function convert(string, plain) { let start = string.indexOf(conf.open); let end = string.indexOf(conf.close, start + conf.open.length); let ogText = string.substring(start, end + conf.close.length); - let str = `${ogText.replace(`${conf.open} `, '').replace(` ${conf.close}`, '')}` + let str = `${ogText.replace(`${conf.open}`, '').replace(`${conf.close}`, '')}` let content = `${str}`; string = string.replace(ogText, content) return string; diff --git a/block/contWarning.js b/block/contWarning.js index 3541344..dbaa413 100644 --- a/block/contWarning.js +++ b/block/contWarning.js @@ -10,7 +10,7 @@ function convert(string, plain) { let start = string.indexOf(conf.open); let end = string.indexOf(conf.close, start + conf.open.length); let ogText = string.substring(start, end + conf.close.length); - let str = `${ogText.replace(`${conf.open} `, '').replace(` ${conf.close}`, '')}` + let str = `${ogText.replace(`${conf.open}`, '').replace(`${conf.close}`, '')}` let content = `${str}`; string = string.replace(ogText, content) return string; diff --git a/dev/test.html b/dev/test.html index 0cb2518..5670557 100644 --- a/dev/test.html +++ b/dev/test.html @@ -1 +1 @@ -

text here

FaxStore is a Node.Js based website and requires a server (VPS, Dedicated) to operate. Shared hosting doesn't work
As FaxStore is a Node.Js operating website it requires a little more power than you might be used to with a more common site. This article covers some more specific details on what you need to run FaxStore. > All of FaxStores documentation is created for Ubuntu 20 based Linux servers. Currently we don't offer any Windows guides. It's highly recommended to use a Ubuntu 20 based Linux server for hosting FaxStore. ### What do you need? To have the ability to have FaxStore running using our installation guide it's recommended to use the following. - Server (This can be a VPS or Dedicated machine, Ubuntu is recommended) - A domain name (faxes.zone for example). This is used to get your website to the online world via a public access domain - PayPal business or Stripe account to be able to receive any payments. - Discord, Google, Twitter, or GitHub account to use for Login methods. #### System Requirements These are the minimum and recommended requirements for your system to have to host FaxStore. | Minimum | Recommended | |----------------------------------------------------------------------|------------------------------------------------------------------------| | OS: Ubuntu 18.04 LTS

Processor: 1 CPU Core

Memory: 2GB

Storage: 25GB | OS: Ubuntu 20.04 LTS

Processor: 3 CPU Cores

Memory: 6GB

Storage: 50GB | These specs may vary and be higher or lower, depending on things like, file size uploads, traffic and other general resource usages. --- #### Don't Have a Server? Looking for some swagger in your hosting? TurboNode's got you covered, they're cheap as chips and have great hardware! \ No newline at end of file +

Phil Bot is a Node.Js based website and requires a server (VPS, Dedicated) to operate. Shared hosting doesn't work

As Phil Bot is a Node.Js operating website it requires a little more power than you might be used to with a more common site. This article covers some more specific details on what you need to run Phil Bot.

All of Phil Bots documentation is created for Ubuntu 20 based Linux servers. Currently we don't offer any Windows guides. It's highly recommended to use a Ubuntu 20 based Linux server for hosting Phil Bot.

What do you need?

To have the ability to have Phil Bot running using our installation guide it's recommended to use the following.

  • Server (This can be a VPS or Dedicated machine, Ubuntu is recommended)
  • A domain name (projectphil.co.uk for example). This is used to get your website to the online world via a public access domain
  • PayPal business or Stripe account to be able to receive any payments.
  • Discord account to use for Login methods.

System Requirements

These are the minimum and recommended requirements for your system to have to host Phil Bot.

MinimumRecommended
OS: Ubuntu 18.04 LTS

Processor: 1 CPU Core

Memory: 2GB

Storage: 25GB

OS: Ubuntu 20.04 LTS

Processor: 3 CPU Cores

Memory: 6GB

Storage: 50GB

These specs may vary and be higher or lower, depending on things like, file size uploads, traffic and other general resource usages.


Don't Have a Server?

Looking for some swagger in your hosting? Infusion Peak Hosting's got you covered, they're cheap as chips and have great hardware!

\ No newline at end of file diff --git a/dev/text.md b/dev/text.md index c317277..f65e95b 100644 --- a/dev/text.md +++ b/dev/text.md @@ -1,27 +1,25 @@ -text here - :::info -FaxStore is a Node.Js based website and requires a server (VPS, Dedicated) to operate. Shared hosting doesn't work +Phil Bot is a Node.Js based website and requires a server (VPS, Dedicated) to operate. Shared hosting doesn't work ::: -As FaxStore is a Node.Js operating website it requires a little more power than you might be used to with a more common site. This article covers some more specific details on what you need to run FaxStore. +As Phil Bot is a Node.Js operating website it requires a little more power than you might be used to with a more common site. This article covers some more specific details on what you need to run Phil Bot. -> All of FaxStores documentation is created for Ubuntu 20 based Linux servers. Currently we don't offer any Windows guides. It's highly recommended to use a Ubuntu 20 based Linux server for hosting FaxStore. +> All of Phil Bots documentation is created for Ubuntu 20 based Linux servers. Currently we don't offer any Windows guides. It's highly recommended to use a Ubuntu 20 based Linux server for hosting Phil Bot. ### What do you need? -To have the ability to have FaxStore running using our installation guide it's recommended to use the following. +To have the ability to have Phil Bot running using our installation guide it's recommended to use the following. - Server (This can be a VPS or Dedicated machine, Ubuntu is recommended) -- A domain name (`faxes.zone` for example). This is used to get your website to the online world via a public access domain +- A domain name (`projectphil.co.uk` for example). This is used to get your website to the online world via a public access domain - PayPal business or Stripe account to be able to receive any payments. -- Discord, Google, Twitter, or GitHub account to use for Login methods. +- Discord account to use for Login methods. #### System Requirements -These are the minimum and recommended requirements for your system to have to host FaxStore. +These are the minimum and recommended requirements for your system to have to host Phil Bot. | Minimum | Recommended | |----------------------------------------------------------------------|------------------------------------------------------------------------| @@ -34,6 +32,6 @@ These specs may vary and be higher or lower, depending on things like, file size #### Don't Have a Server? -Looking for some swagger in your hosting? TurboNode's got you covered, they're cheap as chips and have great hardware! +Looking for some swagger in your hosting? Infusion Peak Hosting's got you covered, they're cheap as chips and have great hardware! - \ No newline at end of file + \ No newline at end of file diff --git a/index.js b/index.js index 1dd8ad5..deee11c 100644 --- a/index.js +++ b/index.js @@ -45,13 +45,11 @@ function updateStyle(index, property) { function convert(string, options = {sanitize: false, plainText: false}) { if(options.sanitize) string = string.replace(/)<[^<]*)*<\/script>/gi, ''); - if(!options.plainText) string = `${string.replaceAll("\r", "").replaceAll("\n", " ")}`; + if(!options.plainText) string = `${string.replaceAll("\r", "")}`; for (let i = 0; i < markdownBlock.length; i++) { const block = markdownBlock[i]; - // console.log(block.open) if(block.open && block.close) { while(findNextMatch(string, block.open, block.close, 0) !== -1) { - // console.log(findNextMatch(string, block.open, block.close, 0), string.substring(findNextMatch(string, block.open, block.close, 0), findNextMatch(string, block.open, block.close, 0)+50)) let r = block.exec(string, options.plainText); string = r; }