mirroring bot - 2025/09/17

Author: updating-bot

svn_trunk/src/jd/plugins/decrypter/TbCmV2.java

@@ -102,7 +102,7 @@
 import org.jdownloader.scripting.JavaScriptEngineFactory;
 import org.jdownloader.settings.staticreferences.CFG_YOUTUBE;
 
-@DecrypterPlugin(revision = "$Revision: 51502 $", interfaceVersion = 3, names = {}, urls = {})
+@DecrypterPlugin(revision = "$Revision: 51507 $", interfaceVersion = 3, names = {}, urls = {})
 public class TbCmV2 extends PluginForDecrypt {
     /* Shorted wait time between requests when JDownloader is run in IDE to allow for faster debugging. */
     private static final int DDOS_WAIT_MAX        = Application.isJared(null) ? 1000 : 10;
@@ -823,7 +823,7 @@ public boolean isRemoteAPIEnabled() {
                  * This helps to speed up crawl process for items that would fail either way.
                  */
                 if (lastVideoFailedErrorMessage != null) {
-                    if (lastVideoFailedErrorMessage.matches("(?i.*This live event will begin in a few moments.*")) {
+                    if (lastVideoFailedErrorMessage.matches("(?i).*This live event will begin in a few moments.*")) {
                         // ignore per video error
                     } else if (lastVideoFailedErrorMessage.matches("(?i).*(confirm your age|age-restricted|inappropriate).*")) {
                         // ignore per video error

svn_trunk/src/jd/plugins/hoster/MixdropCo.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -42,7 +43,7 @@
 import org.jdownloader.captcha.v2.challenge.recaptcha.v2.CaptchaHelperHostPluginRecaptchaV2;
 import org.jdownloader.plugins.components.antiDDoSForHost;
 
-@HostPlugin(revision = "$Revision: 51330 $", interfaceVersion = 3, names = {}, urls = {})
+@HostPlugin(revision = "$Revision: 51506 $", interfaceVersion = 3, names = {}, urls = {})
 public class MixdropCo extends antiDDoSForHost {
     public MixdropCo(PluginWrapper wrapper) {
         super(wrapper);
@@ -65,7 +66,7 @@ public String getAGBLink() {
     private static List<String[]> getPluginDomains() {
         final List<String[]> ret = new ArrayList<String[]>();
         // each entry in List<String[]> will result in one PluginForHost, Plugin.getHost() will return String[0]->main domain
-        ret.add(new String[] { "mixdrop.ag", "mixdrop.co", "mixdrop.to", "mixdrop.club", "mixdrop.sx", "mixdrop.bz", "mixdroop.bz", "mixdrop.vc", "mixdrop.to", "mdy48tn97.com", "mdbekjwqa.pw", "mdfx9dc8n.net", "mdzsmutpcvykb.net", "mixdrop.ms", "mixdrop.is", "mixdrop.si", "mixdrop.ps", "mixdrop.my", "mixdrop.sn", "mixdrop.cfd" });
+        ret.add(new String[] { "mixdrop.ag", "mixdrop.co", "mixdrop.to", "mixdrop.club", "mixdrop.sx", "mixdrop.bz", "mixdroop.bz", "mixdrop.vc", "mixdrop.to", "mdy48tn97.com", "mdbekjwqa.pw", "mdfx9dc8n.net", "mdzsmutpcvykb.net", "mixdrop.ms", "mixdrop.is", "mixdrop.si", "mixdrop.ps", "mixdrop.my", "mixdrop.sn", "mixdrop.cfd", "mixdrop.cv" });
         return ret;
     }
 
@@ -311,9 +312,16 @@ private void handleDownload(final DownloadLink link, final boolean resumable, fi
     protected CaptchaHelperHostPluginRecaptchaV2 getCaptchaHelperHostPluginRecaptchaV2(PluginForHost plugin, Browser br) throws PluginException {
         return new CaptchaHelperHostPluginRecaptchaV2(this, br, this.getReCaptchaKey()) {
 
+            @Override
+            protected Map<String, Object> getV3Action() {
+                final Map<String, Object> ret = new HashMap<String, Object>();
+                ret.put("action", "download");
+                return ret;
+            }
+
             @Override
             public org.jdownloader.captcha.v2.challenge.recaptcha.v2.AbstractRecaptchaV2.VERSION getVersion() {
-                return VERSION.V3;
+                return super.getVersion();
             }
 
             @Override

svn_trunk/src/jd/plugins/hoster/NetnaijafilesXyz.java

@@ -18,15 +18,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jdownloader.plugins.components.YetiShareCore;
-
 import jd.PluginWrapper;
 import jd.plugins.Account;
 import jd.plugins.Account.AccountType;
 import jd.plugins.DownloadLink;
 import jd.plugins.HostPlugin;
 
-@HostPlugin(revision = "$Revision: 51349 $", interfaceVersion = 2, names = {}, urls = {})
+import org.jdownloader.plugins.components.YetiShareCore;
+
+@HostPlugin(revision = "$Revision: 51506 $", interfaceVersion = 2, names = {}, urls = {})
 public class NetnaijafilesXyz extends YetiShareCore {
     public NetnaijafilesXyz(PluginWrapper wrapper) {
         super(wrapper);
@@ -57,6 +57,12 @@ public String[] siteSupportedNames() {
         return buildSupportedNames(getPluginDomains());
     }
 
+    @Override
+    protected boolean requiresWWW() {
+        // doesn't work with www. , returns 404
+        return false;
+    }
+
     public static String[] getAnnotationUrls() {
         return YetiShareCore.buildAnnotationUrls(getPluginDomains());
     }

svn_trunk/src/org/jdownloader/controlling/filter/RuleWrapper.java

@@ -357,9 +357,8 @@ public boolean checkFileName(final CrawledLink link) {
         final DownloadLink downloadLink = link.getDownloadLink();
         if (downloadLink != null) {
             // final or forced filename available
-            String fileName = null;
-            if ((fileName = downloadLink.getFinalFileName()) != null || (fileName = downloadLink.getForcedFileName()) != null) {
-                return rule.matches(pattern, fileName);
+            if (link.isNameSet() || downloadLink.getForcedFileName() != null || downloadLink.getFinalFileName() != null) {
+                return rule.matches(pattern, link.getName());
             }
             // file is online
             if (link.getLinkState() == AvailableLinkState.ONLINE) {