mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-04 04:06:05 +13:00
Removed Imgur https option, now Imgur gonna use https result urls always
This commit is contained in:
parent
e64135f94d
commit
e19b9b7f0d
5 changed files with 13 additions and 67 deletions
|
@ -540,7 +540,6 @@ private void InitializeComponent()
|
||||||
this.tpImageUploaders = new System.Windows.Forms.TabPage();
|
this.tpImageUploaders = new System.Windows.Forms.TabPage();
|
||||||
this.tcImageUploaders = new System.Windows.Forms.TabControl();
|
this.tcImageUploaders = new System.Windows.Forms.TabControl();
|
||||||
this.tpImgur = new System.Windows.Forms.TabPage();
|
this.tpImgur = new System.Windows.Forms.TabPage();
|
||||||
this.cbImgurUseHTTPS = new System.Windows.Forms.CheckBox();
|
|
||||||
this.cbImgurUseGIFV = new System.Windows.Forms.CheckBox();
|
this.cbImgurUseGIFV = new System.Windows.Forms.CheckBox();
|
||||||
this.cbImgurUploadSelectedAlbum = new System.Windows.Forms.CheckBox();
|
this.cbImgurUploadSelectedAlbum = new System.Windows.Forms.CheckBox();
|
||||||
this.cbImgurDirectLink = new System.Windows.Forms.CheckBox();
|
this.cbImgurDirectLink = new System.Windows.Forms.CheckBox();
|
||||||
|
@ -4468,7 +4467,6 @@ private void InitializeComponent()
|
||||||
//
|
//
|
||||||
// tpImgur
|
// tpImgur
|
||||||
//
|
//
|
||||||
this.tpImgur.Controls.Add(this.cbImgurUseHTTPS);
|
|
||||||
this.tpImgur.Controls.Add(this.cbImgurUseGIFV);
|
this.tpImgur.Controls.Add(this.cbImgurUseGIFV);
|
||||||
this.tpImgur.Controls.Add(this.cbImgurUploadSelectedAlbum);
|
this.tpImgur.Controls.Add(this.cbImgurUploadSelectedAlbum);
|
||||||
this.tpImgur.Controls.Add(this.cbImgurDirectLink);
|
this.tpImgur.Controls.Add(this.cbImgurDirectLink);
|
||||||
|
@ -4482,13 +4480,6 @@ private void InitializeComponent()
|
||||||
this.tpImgur.Name = "tpImgur";
|
this.tpImgur.Name = "tpImgur";
|
||||||
this.tpImgur.UseVisualStyleBackColor = true;
|
this.tpImgur.UseVisualStyleBackColor = true;
|
||||||
//
|
//
|
||||||
// cbImgurUseHTTPS
|
|
||||||
//
|
|
||||||
resources.ApplyResources(this.cbImgurUseHTTPS, "cbImgurUseHTTPS");
|
|
||||||
this.cbImgurUseHTTPS.Name = "cbImgurUseHTTPS";
|
|
||||||
this.cbImgurUseHTTPS.UseVisualStyleBackColor = true;
|
|
||||||
this.cbImgurUseHTTPS.CheckedChanged += new System.EventHandler(this.cbImgurUseHTTPS_CheckedChanged);
|
|
||||||
//
|
|
||||||
// cbImgurUseGIFV
|
// cbImgurUseGIFV
|
||||||
//
|
//
|
||||||
resources.ApplyResources(this.cbImgurUseGIFV, "cbImgurUseGIFV");
|
resources.ApplyResources(this.cbImgurUseGIFV, "cbImgurUseGIFV");
|
||||||
|
@ -5693,7 +5684,6 @@ private void InitializeComponent()
|
||||||
private System.Windows.Forms.PictureBox pbPuush;
|
private System.Windows.Forms.PictureBox pbPuush;
|
||||||
private System.Windows.Forms.CheckBox cbHastebinUseFileExtension;
|
private System.Windows.Forms.CheckBox cbHastebinUseFileExtension;
|
||||||
private System.Windows.Forms.Label lblOwnCloudHostExample;
|
private System.Windows.Forms.Label lblOwnCloudHostExample;
|
||||||
private System.Windows.Forms.CheckBox cbImgurUseHTTPS;
|
|
||||||
internal System.Windows.Forms.TabPage tpPastie;
|
internal System.Windows.Forms.TabPage tpPastie;
|
||||||
private System.Windows.Forms.CheckBox cbPastieIsPublic;
|
private System.Windows.Forms.CheckBox cbPastieIsPublic;
|
||||||
private System.Windows.Forms.CheckBox cbPolrUseAPIv1;
|
private System.Windows.Forms.CheckBox cbPolrUseAPIv1;
|
||||||
|
|
|
@ -187,7 +187,6 @@ public void LoadSettings()
|
||||||
cbImgurThumbnailType.Items.Clear();
|
cbImgurThumbnailType.Items.Clear();
|
||||||
cbImgurThumbnailType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ImgurThumbnailType>());
|
cbImgurThumbnailType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ImgurThumbnailType>());
|
||||||
cbImgurThumbnailType.SelectedIndex = (int)Config.ImgurThumbnailType;
|
cbImgurThumbnailType.SelectedIndex = (int)Config.ImgurThumbnailType;
|
||||||
cbImgurUseHTTPS.Checked = Config.ImgurUseHTTPS;
|
|
||||||
cbImgurUseGIFV.Checked = Config.ImgurUseGIFV;
|
cbImgurUseGIFV.Checked = Config.ImgurUseGIFV;
|
||||||
cbImgurUploadSelectedAlbum.Checked = Config.ImgurUploadSelectedAlbum;
|
cbImgurUploadSelectedAlbum.Checked = Config.ImgurUploadSelectedAlbum;
|
||||||
ImgurFillAlbumList();
|
ImgurFillAlbumList();
|
||||||
|
@ -845,11 +844,6 @@ private void cbImgurThumbnailType_SelectedIndexChanged(object sender, EventArgs
|
||||||
Config.ImgurThumbnailType = (ImgurThumbnailType)cbImgurThumbnailType.SelectedIndex;
|
Config.ImgurThumbnailType = (ImgurThumbnailType)cbImgurThumbnailType.SelectedIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void cbImgurUseHTTPS_CheckedChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
Config.ImgurUseHTTPS = cbImgurUseHTTPS.Checked;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void cbImgurUseGIFV_CheckedChanged(object sender, EventArgs e)
|
private void cbImgurUseGIFV_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Config.ImgurUseGIFV = cbImgurUseGIFV.Checked;
|
Config.ImgurUseGIFV = cbImgurUseGIFV.Checked;
|
||||||
|
|
|
@ -13274,36 +13274,6 @@ Using an encrypted library disables sharing.</value>
|
||||||
<data name=">>tpTextUploaders.ZOrder" xml:space="preserve">
|
<data name=">>tpTextUploaders.ZOrder" xml:space="preserve">
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbImgurUseHTTPS.AutoSize" type="System.Boolean, mscorlib">
|
|
||||||
<value>True</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbImgurUseHTTPS.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
|
||||||
<value>NoControl</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbImgurUseHTTPS.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>16, 376</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbImgurUseHTTPS.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>118, 17</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbImgurUseHTTPS.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>11</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbImgurUseHTTPS.Text" xml:space="preserve">
|
|
||||||
<value>Use "https://" links</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>cbImgurUseHTTPS.Name" xml:space="preserve">
|
|
||||||
<value>cbImgurUseHTTPS</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>cbImgurUseHTTPS.Type" xml:space="preserve">
|
|
||||||
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>cbImgurUseHTTPS.Parent" xml:space="preserve">
|
|
||||||
<value>tpImgur</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>cbImgurUseHTTPS.ZOrder" xml:space="preserve">
|
|
||||||
<value>0</value>
|
|
||||||
</data>
|
|
||||||
<data name="cbImgurUseGIFV.AutoSize" type="System.Boolean, mscorlib">
|
<data name="cbImgurUseGIFV.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -13311,7 +13281,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>NoControl</value>
|
<value>NoControl</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbImgurUseGIFV.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="cbImgurUseGIFV.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>16, 400</value>
|
<value>16, 376</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbImgurUseGIFV.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="cbImgurUseGIFV.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>160, 17</value>
|
<value>160, 17</value>
|
||||||
|
@ -13332,7 +13302,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cbImgurUseGIFV.ZOrder" xml:space="preserve">
|
<data name=">>cbImgurUseGIFV.ZOrder" xml:space="preserve">
|
||||||
<value>1</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbImgurUploadSelectedAlbum.AutoSize" type="System.Boolean, mscorlib">
|
<data name="cbImgurUploadSelectedAlbum.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
|
@ -13362,7 +13332,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cbImgurUploadSelectedAlbum.ZOrder" xml:space="preserve">
|
<data name=">>cbImgurUploadSelectedAlbum.ZOrder" xml:space="preserve">
|
||||||
<value>2</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbImgurDirectLink.AutoSize" type="System.Boolean, mscorlib">
|
<data name="cbImgurDirectLink.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
|
@ -13392,7 +13362,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cbImgurDirectLink.ZOrder" xml:space="preserve">
|
<data name=">>cbImgurDirectLink.ZOrder" xml:space="preserve">
|
||||||
<value>3</value>
|
<value>2</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="atcImgurAccountType.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="atcImgurAccountType.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>16, 16</value>
|
<value>16, 16</value>
|
||||||
|
@ -13413,7 +13383,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>atcImgurAccountType.ZOrder" xml:space="preserve">
|
<data name=">>atcImgurAccountType.ZOrder" xml:space="preserve">
|
||||||
<value>4</value>
|
<value>3</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="oauth2Imgur.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="oauth2Imgur.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>16, 64</value>
|
<value>16, 64</value>
|
||||||
|
@ -13434,7 +13404,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>oauth2Imgur.ZOrder" xml:space="preserve">
|
<data name=">>oauth2Imgur.ZOrder" xml:space="preserve">
|
||||||
<value>5</value>
|
<value>4</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="chImgurID.Text" xml:space="preserve">
|
<data name="chImgurID.Text" xml:space="preserve">
|
||||||
<value>ID</value>
|
<value>ID</value>
|
||||||
|
@ -13470,7 +13440,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lvImgurAlbumList.ZOrder" xml:space="preserve">
|
<data name=">>lvImgurAlbumList.ZOrder" xml:space="preserve">
|
||||||
<value>6</value>
|
<value>5</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnImgurRefreshAlbumList.Enabled" type="System.Boolean, mscorlib">
|
<data name="btnImgurRefreshAlbumList.Enabled" type="System.Boolean, mscorlib">
|
||||||
<value>False</value>
|
<value>False</value>
|
||||||
|
@ -13500,7 +13470,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>btnImgurRefreshAlbumList.ZOrder" xml:space="preserve">
|
<data name=">>btnImgurRefreshAlbumList.ZOrder" xml:space="preserve">
|
||||||
<value>7</value>
|
<value>6</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbImgurThumbnailType.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="cbImgurThumbnailType.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>16, 344</value>
|
<value>16, 344</value>
|
||||||
|
@ -13521,7 +13491,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cbImgurThumbnailType.ZOrder" xml:space="preserve">
|
<data name=">>cbImgurThumbnailType.ZOrder" xml:space="preserve">
|
||||||
<value>8</value>
|
<value>7</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblImgurThumbnailType.AutoSize" type="System.Boolean, mscorlib">
|
<data name="lblImgurThumbnailType.AutoSize" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
|
@ -13551,7 +13521,7 @@ Using an encrypted library disables sharing.</value>
|
||||||
<value>tpImgur</value>
|
<value>tpImgur</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lblImgurThumbnailType.ZOrder" xml:space="preserve">
|
<data name=">>lblImgurThumbnailType.ZOrder" xml:space="preserve">
|
||||||
<value>9</value>
|
<value>8</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="tpImgur.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="tpImgur.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>4, 22</value>
|
<value>4, 22</value>
|
||||||
|
|
|
@ -77,7 +77,6 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
|
||||||
UploadMethod = config.ImgurAccountType,
|
UploadMethod = config.ImgurAccountType,
|
||||||
DirectLink = config.ImgurDirectLink,
|
DirectLink = config.ImgurDirectLink,
|
||||||
ThumbnailType = config.ImgurThumbnailType,
|
ThumbnailType = config.ImgurThumbnailType,
|
||||||
UseHTTPS = config.ImgurUseHTTPS,
|
|
||||||
UseGIFV = config.ImgurUseGIFV,
|
UseGIFV = config.ImgurUseGIFV,
|
||||||
UploadAlbumID = albumID
|
UploadAlbumID = albumID
|
||||||
};
|
};
|
||||||
|
@ -93,7 +92,6 @@ public sealed class Imgur : ImageUploader, IOAuth2
|
||||||
public ImgurThumbnailType ThumbnailType { get; set; }
|
public ImgurThumbnailType ThumbnailType { get; set; }
|
||||||
public string UploadAlbumID { get; set; }
|
public string UploadAlbumID { get; set; }
|
||||||
public bool DirectLink { get; set; }
|
public bool DirectLink { get; set; }
|
||||||
public bool UseHTTPS { get; set; }
|
|
||||||
public bool UseGIFV { get; set; }
|
public bool UseGIFV { get; set; }
|
||||||
|
|
||||||
public Imgur(OAuth2Info oauth)
|
public Imgur(OAuth2Info oauth)
|
||||||
|
@ -295,7 +293,7 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
result.URL = $"http://imgur.com/{imageData.id}";
|
result.URL = $"https://imgur.com/{imageData.id}";
|
||||||
}
|
}
|
||||||
|
|
||||||
string thumbnail = "";
|
string thumbnail = "";
|
||||||
|
@ -322,13 +320,8 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
result.ThumbnailURL = $"http://i.imgur.com/{imageData.id}{thumbnail}.jpg"; // Imgur thumbnails always jpg
|
result.ThumbnailURL = $"https://i.imgur.com/{imageData.id}{thumbnail}.jpg"; // Imgur thumbnails always jpg
|
||||||
result.DeletionURL = $"http://imgur.com/delete/{imageData.deletehash}";
|
result.DeletionURL = $"https://imgur.com/delete/{imageData.deletehash}";
|
||||||
|
|
||||||
if (UseHTTPS)
|
|
||||||
{
|
|
||||||
result.ForceHTTPS();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -41,7 +41,6 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
|
||||||
public AccountType ImgurAccountType = AccountType.Anonymous;
|
public AccountType ImgurAccountType = AccountType.Anonymous;
|
||||||
public bool ImgurDirectLink = true;
|
public bool ImgurDirectLink = true;
|
||||||
public ImgurThumbnailType ImgurThumbnailType = ImgurThumbnailType.Medium_Thumbnail;
|
public ImgurThumbnailType ImgurThumbnailType = ImgurThumbnailType.Medium_Thumbnail;
|
||||||
public bool ImgurUseHTTPS = false;
|
|
||||||
public bool ImgurUseGIFV = true;
|
public bool ImgurUseGIFV = true;
|
||||||
public OAuth2Info ImgurOAuth2Info = null;
|
public OAuth2Info ImgurOAuth2Info = null;
|
||||||
public bool ImgurUploadSelectedAlbum = false;
|
public bool ImgurUploadSelectedAlbum = false;
|
||||||
|
|
Loading…
Reference in a new issue